made work with new collections on database
Added the ability to save messages to the database.
Updating TODOs
Merge remote-tracking branch 'origin/master'