Began refactoring Shell to use CommandController API