Started adding some of the msg functionality