Added the ability to set the time left and a bunch of other stuff
Formatting