Creating new commands, and refactorings