Test
Added events.
Added events.
Cleaned up errors.
Started working on controller event.
Merge remote-tracking branch 'origin/master' into JesseMOE