Partial Timer
Added felix's stuff, will have to think about a solution
Minor fixes