*TEMPORARY* refactoring
Merge branch 'feature/refactor-command'