Lots of event handling changes

Need to wait to get home to test