More refactoring of commands, get them to work.