Last commit before merging ShapeFileClasses and Geographic Component Objects