Added new mode, but not working yet
Messaging feature complete