design for ordinal support
Tests added for the various cases
Merge branch 'date_time_branch'