Making messages works now!
Merge branch 'fixing'
Adding messages stuff
 message to explain why this merge is necessary,