started working on map for messages
moved all messages to map