Big refactor to pull apart the messaging technology