The Octree seems to be working with minimal modification. I've opened up some new issues and I'm ready to start tinkering. I still want to save this copy in case anything goes wrong.