ADD: Class Geometry added. Various improvements made.