refactoring and new commands

and what do you propose?