Add a lot of stuff, Final product

Timer resets, etc…