Fixed a queueing error and also began writing a more general event structure to be processed by the queue.