Messages refactor 80%