Events and Timer

Structured out Events and Timer. Made a few adjustments for accessors.