more events!!
Moved events into separate file
cleanup