Whole bunch of changes for commands