Added geometry class, appears to be working