made a ton of changes and then reversed them entirely for messages model
made a ton of changes related to messages