DateSpan abstraction
Post Processor Realignment
Merge Conflicts, new enum, Spring changes, refactoring.