Commands runs itself
Refactor to let commands run itself