Refactor deck-reshuffling into one line
Begin moving game messages to a messages-handler
Finish moving messages over to message-handler