WIP switch to rtree