included logic about what messages to build into the eventhandler classa and extracted it from the controller
merge conflict