diff --git a/sim/Propagator.cpp b/sim/Propagator.cpp
index c8344fb..b33a15d 100644
--- a/sim/Propagator.cpp
+++ b/sim/Propagator.cpp
@@ -67,7 +67,7 @@ Propagator::Propagator(std::shared_ptr<Rocket> r)
 
    };
 
-   linearIntegrator.reset(new RK4Solver<Vector6>(linearODE));
+   linearIntegrator.reset(new RK4Solver<Vector3>(linearODE));
    linearIntegrator->setTimeStep(timeStep);
    
    // This is pure quaternion
@@ -113,6 +113,15 @@ Propagator::Propagator(std::shared_ptr<Rocket> r)
 //       }));
 //   orientationIntegrator->setTimeStep(timeStep);
 
+   std::function<std::pair<Quaternion, Quaternion>(Quaternion&, Quaternion&)> orientationODE =
+   [this](Quaternion& qOri, Quaternion& qRate) -> std::pair<Quaternion, Quaternion>
+   {
+      Quaternion dOri;
+      Quaternion dOriRate;
+
+      Matrix4
+   }
+
    saveStates = true;
 }
 
diff --git a/sim/Propagator.h b/sim/Propagator.h
index d2ef7ca..ada9686 100644
--- a/sim/Propagator.h
+++ b/sim/Propagator.h
@@ -11,7 +11,7 @@
 /// \endcond
 
 // qtrocket headers
-#include "sim/DESolver.h"
+#include "sim/RK4Solver.h"
 #include "utils/math/MathTypes.h"
 #include "sim/StateData.h"
 
@@ -72,7 +72,7 @@ private:
    double getIroll()  { return 1.0; }
 
    std::unique_ptr<sim::RK4Solver<Vector3>> linearIntegrator;
-   std::unique_ptr<sim::RK4Solver<Quaternion>> orientationIntegrator;
+//   std::unique_ptr<sim::RK4Solver<Quaternion>> orientationIntegrator;
 
    std::shared_ptr<Rocket> rocket;