All the messages

Hopefully only changed the single lines

Fixxed the couple issues

More confilicts.....

Fixed merge issues