I have to agree wholeheartedly. The actual content in a classical geometry class is mostly related to logic; axiom, proof, theorem, inference, etc. If you remo

I have to agree wholeheartedly. The actual content in a classical geometry class is mostly related to logic; axiom, proof, theorem, inference, etc. If you remove all of that, you can embed actual geometric content into other classes as you go, much like probability and statistics is currently integrated across multiple years.