trying to get messages to work
changes with master
not sure whats going on
merge issues