fixing current time, this whole thing needs some test coverage