Intend to clean this up when it becomes a sub-command.