Index: code/branches/hoverHS15/src/modules/hover/Hover.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/Hover.cc	(revision 10751)
+++ code/branches/hoverHS15/src/modules/hover/Hover.cc	(revision 10760)
@@ -56,7 +56,9 @@
         SUPER(Hover, tick, dt);
 
-        if(firstTick){
+        if(firstTick)
+        {
             firstTick = false;
             new HoverWall(origin_->getContext(), 1, 2);
+            new HoverWall(origin_->getContext(), 2, 6);
         }      
 
Index: code/branches/hoverHS15/src/modules/hover/HoverShip.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverShip.cc	(revision 10751)
+++ code/branches/hoverHS15/src/modules/hover/HoverShip.cc	(revision 10760)
@@ -49,5 +49,5 @@
     }
 
-    void HoverShip::moveFrontBack(const Vector2& value)
+    /*void HoverShip::moveFrontBack(const Vector2& value)
                 { this->steering_.z -= value.x; }
 
@@ -60,8 +60,10 @@
     void HoverShip::rotateYaw(const Vector2& value) {}
     void HoverShip::rotatePitch(const Vector2& value) {}
-    void HoverShip::rotateRoll(const Vector2& value) {}
+    void HoverShip::rotateRoll(const Vector2& value) {}*/
 
-    bool HoverShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool HoverShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
+        orxout() << "collision" << endl;
+
         /*if (contactPoint.m_normalWorldOnB.y() > 0.6)
             this->isFloor_ = true;
Index: code/branches/hoverHS15/src/modules/hover/HoverShip.h
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverShip.h	(revision 10751)
+++ code/branches/hoverHS15/src/modules/hover/HoverShip.h	(revision 10760)
@@ -53,5 +53,5 @@
             virtual void tick(float dt);
 
-		    virtual void moveFrontBack(const Vector2& value);
+		    /*virtual void moveFrontBack(const Vector2& value);
 
 		    virtual void moveRightLeft(const Vector2& value);
@@ -63,7 +63,7 @@
 		    virtual void rotatePitch(const Vector2& value);
 		    
-		    virtual void rotateRoll(const Vector2& value);
+		    virtual void rotateRoll(const Vector2& value);*/
 
-		    virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+		    virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
 		    virtual void boost(bool bBoost);
Index: code/branches/hoverHS15/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/hoverHS15/src/modules/hover/HoverWall.cc	(revision 10751)
+++ code/branches/hoverHS15/src/modules/hover/HoverWall.cc	(revision 10760)
@@ -50,14 +50,6 @@
     {
         RegisterObject(HoverWall);
-        model_ = new Model(context);
-        cs_ = new BoxCollisionShape(context);
-        model_->setMeshSource("cube.mesh");
-        model_->setScale3D(Vector3(100, 30, 2));
-        model_->setPosition(Vector3(100,0,100));
-        cs_->setPosition(Vector3(100,0,100));
-        cs_->setHalfExtents(Vector3(100, 30, 2));
-
-
-
+        model_ = NULL;
+        cs_ = NULL;
     }
 
@@ -65,14 +57,21 @@
     {
         RegisterObject(HoverWall);
+
         model_ = new Model(context);
+        model_->setMeshSource("cube.mesh");
+        model_->setScale3D(Vector3(100, 30, 2));
+        model_->setPosition(Vector3(x*100-50,0,y*100-50));
+
+        this->attach(model_);
+
+        this->enableCollisionCallback();
+        this->setCollisionResponse(true);
+        this->setCollisionType(Static);
+
         cs_ = new BoxCollisionShape(context);
-        model_->setMeshSource("cube.mesh");
-        model_->setScale3D(Vector3(50, 30, 2));
-        model_->setPosition(Vector3(x*100-50,0,y*100-50));
+        cs_->setHalfExtents(Vector3(100, 30, 2));
         cs_->setPosition(Vector3(x*100-50,0,y*100-50));
-        cs_->setHalfExtents(Vector3(50, 30, 2));
 
-
-
+        this->attachCollisionShape(cs_);
     }
 
