Fix my terrible datemath