move stuff around
add bounding box calculations
remove duplicate include