Added some basic message logic