Refactored framework to use the new Timer and Logger.
Changed tab indentation to spaces.