Refactoring, new CLI interface.