Save place - continue refactoring command manager.  Tomorrow: finish porting commands over.