Message logic refactor 60%