Linking Theory and Practice in Teaching Geometry