BVH still needs debugging.  Intermediate commit due to possible power loss.