Revert "Completed More of Geometry II"

This reverts commit db2b79a6831ab9f1dbc6d224dee3e1937fcdd1df.
Revert "Revert "Completed More of Geometry II""

This reverts commit e3963983c1a38ca27caefb1ed371d63a1dbfe5d4.