Added some more chat functionality