Some more changes
Messaging is in