finish moving standalone code into MESSAGE and CONVERSATION classes