Starting refactor for the new msgs