Added messaging system (work in progress)