More work on event handling, just ironing some kinks now