diff --git a/src/ds/aabb.rs b/src/ds/aabb.rs
index 610623b..b1fda39 100644
--- a/src/ds/aabb.rs
+++ b/src/ds/aabb.rs
@@ -79,14 +79,39 @@ impl Renderable for Aabb {
                 return None;
             }
         }
-        return Some(t_enter);
+        
+        if t_enter >= 0.0 {
+            Some(t_enter)
+        } else if t_exit >= 0.0 {
+            Some(t_exit)  // origin is inside the box
+        } else {
+            None  // box is entirely behind the ray
+        }
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
         self
     }
 
-    fn center(&self) -> crate::ds::Vector3 {
+    fn center(&self) -> ds::Vector3 {
         ds::Vector3::new(self.x.middle(), self.y.middle(), self.z.middle())
     }
+
+    fn normal(&self, pos: &ds::Vector3) -> ds::Vector3 {
+        let cx = self.x.middle();
+        let cy = self.y.middle();
+        let cz = self.z.middle();
+
+        let dx = (pos.x - cx).abs() / (self.x.size() / 2.0);
+        let dy = (pos.y - cy).abs() / (self.y.size() / 2.0);
+        let dz = (pos.z - cz).abs() / (self.z.size() / 2.0);
+
+        if dx >= dy && dx >= dz {
+            ds::Vector3::new((pos.x - cx).signum(), 0.0, 0.0)
+        } else if dy >= dz {
+            ds::Vector3::new(0.0, (pos.y - cy).signum(), 0.0)
+        } else {
+            ds::Vector3::new(0.0, 0.0, (pos.z - cz).signum())
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/object/quad.rs b/src/object/quad.rs
index 90868c8..2cc8eac 100644
--- a/src/object/quad.rs
+++ b/src/object/quad.rs
@@ -51,10 +51,14 @@ impl Renderable for Quad {
         self
     }
 
-    fn center(&self) -> crate::ds::Vector3 {
+    fn center(&self) -> ds::Vector3 {
         self.q + self.u/2.0 + self.v/2.0
     }
 
+    fn normal(&self, _pos: &ds::Vector3) -> ds::Vector3 {
+        return self.normal;
+    }
+
     fn intersects(&self, ray: &ds::Ray) -> Option<f64> {
         let denominator = self.normal.dot(&ray.direction);
 
diff --git a/src/object/renderable.rs b/src/object/renderable.rs
index c5941ab..f61b552 100644
--- a/src/object/renderable.rs
+++ b/src/object/renderable.rs
@@ -2,6 +2,7 @@ pub trait Renderable: Send + Sync {
     fn as_any(&self) -> &dyn std::any::Any;
     fn center(&self) -> crate::ds::Vector3;
     fn intersects(&self, ray: &crate::ds::Ray) -> Option<f64>;
+    fn normal(&self, pos: &crate::ds::Vector3) -> crate::ds::Vector3;
 }
 
 pub trait ToGpu<T> {
diff --git a/src/object/sphere.rs b/src/object/sphere.rs
index d3a75e4..4f28803 100644
--- a/src/object/sphere.rs
+++ b/src/object/sphere.rs
@@ -43,6 +43,10 @@ impl Renderable for Sphere {
         self.center
     }
 
+    fn normal(&self, pos: &ds::Vector3) -> ds::Vector3 {
+        (pos - self.center).unit_vector()
+    }
+
     fn intersects(&self, ray: &ds::Ray) -> Option<f64> {
         let oc = self.center - ray.origin;
         let a  = ray.direction.dot(&ray.direction);