Added some more events and moved eventqueue up one level