Adding work for the day. Started refactoring the messaging into classes.