some more refactoring and implemented an ordinal day function, we're ready to actually integrate