almost finished

TODO: Fix bounding box