Addition of MapLoader and ContentController, Merge with Derek's Latest