First version of MessageSystem
Minor changes in Main