Finished  changing the commands to use the MessageHandler.