don't need this here anymore
Merge branch 'listen_messages'