Moving around date and time stuff - trying to design myself out of a corner