Finished refactoring R1 Commands