Added message manager WIP