Should probably commit the message queue module too