Need work from BoundingBoxManager to continue
Same as last commit