Timer fix

My latest changes to the timer broke it, so I just reverted the run method to the 1st change, which works, keeping the observer pattern. I'm truly sorry :S