Add all messages to the database
Add data object for Messages
Fix remaining problems with message propogation