eeue56 HUGE refactoring, start dealing with events properly

Latest commit c131491

Mar 1, 2017