Added more classes.  Basic implementation of SearchCommand.