Latest version
Refactoring all to run as commands