Refactoring, and new Commands