More Cleanup

Timer almost fully functional