various include hierarchy commands and refactors, still in progress
continue refactoring; UpdateMapEntryCommand