diff --git a/Code/OysterPhysics3D/ICollideable.h b/Code/OysterPhysics3D/ICollideable.h
index 14676a1e..a8eb9464 100644
--- a/Code/OysterPhysics3D/ICollideable.h
+++ b/Code/OysterPhysics3D/ICollideable.h
@@ -6,6 +6,7 @@
 #ifndef OYSTER_COLLISION_3D_ICOLLIDEABLE_H
 #define OYSTER_COLLISION_3D_ICOLLIDEABLE_H
 
+#include "OysterMath.h"
 #include "Utilities.h"
 
 namespace Oyster { namespace Collision3D //! Contains a collection of 3D shapes and intercollission algorithms.
diff --git a/Code/OysterPhysics3D/Plane.cpp b/Code/OysterPhysics3D/Plane.cpp
index 87d20c84..f44ba810 100644
--- a/Code/OysterPhysics3D/Plane.cpp
+++ b/Code/OysterPhysics3D/Plane.cpp
@@ -60,8 +60,8 @@ bool Plane::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worl
 	case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact );
 	case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
 	// case Type_triangle: return false; // TODO: 
-	case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
-	case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
+	case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
+	case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
 	case Type_frustrum: return false; // TODO: 
 	default: worldPointOfContact = NULL;
 		return false;
diff --git a/Code/OysterPhysics3D/Point.cpp b/Code/OysterPhysics3D/Point.cpp
index 717b47a4..2981f268 100644
--- a/Code/OysterPhysics3D/Point.cpp
+++ b/Code/OysterPhysics3D/Point.cpp
@@ -58,8 +58,8 @@ bool Point::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worl
 	case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, worldPointOfContact );
 	case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
 	// case Type_triangle: return false; // TODO: 
-	case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
-	case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
+	case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
+	case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
 	case Type_frustrum: return false; // TODO: 
 	default: worldPointOfContact = NULL;
 		return false;
diff --git a/Code/OysterPhysics3D/Ray.cpp b/Code/OysterPhysics3D/Ray.cpp
index d1e81974..86823b69 100644
--- a/Code/OysterPhysics3D/Ray.cpp
+++ b/Code/OysterPhysics3D/Ray.cpp
@@ -67,8 +67,8 @@ bool Ray::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &worldP
 	case Type_sphere: return Utility::Intersect( *(Sphere*)&target, *this, this->collisionDistance, worldPointOfContact );
 	case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, this->collisionDistance, worldPointOfContact );
 	// case Type_triangle: return false; // TODO: 
-	case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, this->collisionDistance, worldPointOfContact );
-	case Type_box: return Utility::Intersect( *(Box*)&target, *this, this->collisionDistance, worldPointOfContact );
+	case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, this->collisionDistance, worldPointOfContact );
+	case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, this->collisionDistance, worldPointOfContact );
 	case Type_frustrum: return false; // TODO: 
 	default: worldPointOfContact = NULL;
 		return false;
diff --git a/Code/OysterPhysics3D/Ray.h b/Code/OysterPhysics3D/Ray.h
index 52131af3..bae600e4 100644
--- a/Code/OysterPhysics3D/Ray.h
+++ b/Code/OysterPhysics3D/Ray.h
@@ -10,7 +10,6 @@
 #ifndef OYSTER_COLLISION_3D_RAY_H
 #define OYSTER_COLLISION_3D_RAY_H
 
-#include "OysterMath.h"
 #include "ICollideable.h"
 
 namespace Oyster { namespace Collision3D
diff --git a/Code/OysterPhysics3D/Sphere.cpp b/Code/OysterPhysics3D/Sphere.cpp
index 399fd0be..e31a361c 100644
--- a/Code/OysterPhysics3D/Sphere.cpp
+++ b/Code/OysterPhysics3D/Sphere.cpp
@@ -55,8 +55,8 @@ bool Sphere::Intersects( const ICollideable &target, ::Oyster::Math::Float3 &wor
 	case Type_sphere: return Utility::Intersect( *this, *(Sphere*)&target, worldPointOfContact );
 	case Type_plane: return Utility::Intersect( *(Plane*)&target, *this, worldPointOfContact );
 	// case Type_triangle: return false; // TODO: 
-	case Type_box_axis_aligned: return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
-	case Type_box: return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
+	case Type_box_axis_aligned: return false; // return Utility::Intersect( *(BoxAxisAligned*)&target, *this, worldPointOfContact );
+	case Type_box: return false; // return Utility::Intersect( *(Box*)&target, *this, worldPointOfContact );
 	case Type_frustrum: return false; // TODO: 
 	default: worldPointOfContact = Float3::null;
 		return false;
diff --git a/Code/OysterPhysics3D/Universe.h b/Code/OysterPhysics3D/Universe.h
index fce8179e..aa497cbc 100644
--- a/Code/OysterPhysics3D/Universe.h
+++ b/Code/OysterPhysics3D/Universe.h
@@ -7,6 +7,7 @@
 #define OYSTER_COLLISION_3D_UNIVERSE_H
 
 #include "ICollideable.h"
+#include "OysterMath.h"
 
 namespace Oyster { namespace Collision3D
 {