trying to break up CommandMaps