Revert "Revert "All Geometry""

This reverts commit d031bdd9a6f1c8baa3c5bc642493166c0735f2b7.
1