Refactored Span, got most of the functionality working again now.