Added some classes to prepare for a message queue.