large edit for message system, fully integrated now