Re-architect to use RabbitMQ
Fixes