Moved around some time formatting functions
Reworked some of the timer code
Fixed timing bug
Started working on new time line