Merge pull request #8 from ryanmjacobs/new_time_system

Simplify!