Commented out some unused functionality to speed things up
Updated the example to work, more work on factory, adding message queues etc