Refactor to start using sub-commands.