changed Grid to Geometry, started adding Grid and Point classes