Add a Queue class to hold subscriptions
Fix assigning message ids