Conversation merge

This integrates the work done at the last sprint at the Cosent office.