Refactored stuff and changed EventQueueInterface to take a Message