work on refactoring events
rename some stuff
merge with paul_merge
minor change
working events refactor
remove console logging
Merge branch 'refactor_events' into paul_merge