Fixes
Refactored and fixed EventHandler. Or attempted to fix it.
Merge remote-tracking branch 'connor/Saros2' into saros2