Added geometry class; continuing to build