Tons of changes, moved to using amqp lib direct.