Prepare to split out command processing to new module