trying to implement message service
solved merge conflicts
improved messaging system. not finished yet.
merge conflict