Changings a lot of things, mainly trying to make the message back end tie with the front end
merges and fixes conflict