using Date and Time to make the math more obvious

this is not as well tested as it should be :(