Starting to merge with existing commands
Adding methods to modify the state