Bounding Box refactor for a more stable solution.