wanted to remove this for quite a while as it is; will need to revise geometry.h; possibly need to remove most of the code in there as well