Consolidated all of the handlers to use the ICommand handler