diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7a90885a..aeafd232 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -53,6 +53,7 @@
         "pressurecell.h": "c",
         "pressure.h": "c",
         "tracking.h": "c",
-        "multigrid_navier_stokes.h": "c"
+        "multigrid_navier_stokes.h": "c",
+        "navier_stokes.h": "c"
     }
 }
\ No newline at end of file
diff --git a/src/main/c/includes/math/ode/gauss_seidel.h b/src/main/c/includes/math/ode/gauss_seidel.h
index bd48b608..2e719874 100644
--- a/src/main/c/includes/math/ode/gauss_seidel.h
+++ b/src/main/c/includes/math/ode/gauss_seidel.h
@@ -11,7 +11,7 @@
  * Gets the index into the array
  */
 static inline int solver_gauss_seidel_get_index(int x, int y, int z, int N){
-    return (x + (N * y) +  (N * N * z));
+    return (x + (N * y) + (N * N * z));
 }
 
 
@@ -36,11 +36,11 @@ static inline void solver_gauss_seidel_iterate_serial(float * phi, float * phi0,
                 (
                     phi0[solver_gauss_seidel_get_index(i,j,k,gridDim)] + 
                     a * (
-                        phi[solver_gauss_seidel_get_index(i-1,j,k,gridDim)]+
-                        phi[solver_gauss_seidel_get_index(i+1,j,k,gridDim)]+
-                        phi[solver_gauss_seidel_get_index(i,j-1,k,gridDim)]+
-                        phi[solver_gauss_seidel_get_index(i,j+1,k,gridDim)]+
-                        phi[solver_gauss_seidel_get_index(i,j,k-1,gridDim)]+
+                        phi[solver_gauss_seidel_get_index(i-1,j,k,gridDim)] +
+                        phi[solver_gauss_seidel_get_index(i+1,j,k,gridDim)] +
+                        phi[solver_gauss_seidel_get_index(i,j-1,k,gridDim)] +
+                        phi[solver_gauss_seidel_get_index(i,j+1,k,gridDim)] +
+                        phi[solver_gauss_seidel_get_index(i,j,k-1,gridDim)] +
                         phi[solver_gauss_seidel_get_index(i,j,k+1,gridDim)]
                     )
                 ) / c;
diff --git a/src/main/c/includes/math/ode/tuned/navier_stokes.h b/src/main/c/includes/math/ode/tuned/navier_stokes.h
new file mode 100644
index 00000000..0b0f58d5
--- /dev/null
+++ b/src/main/c/includes/math/ode/tuned/navier_stokes.h
@@ -0,0 +1,25 @@
+#ifndef MATH_ODE_TUNED_NAVIER_STOKES_H
+#define MATH_ODE_TUNED_NAVIER_STOKES_H
+
+#include "public.h"
+#include "fluid/queue/chunk.h"
+
+/**
+ * Calculates the residual for the approximation
+ */
+LIBRARY_API float solver_navier_stokes_get_residual(float * phi, float * phi0, int x, int y, int z, int GRIDDIM);
+
+/**
+ * Calculates the residual for the approximation
+ */
+LIBRARY_API void solver_navier_stokes_approximate(float * phi, float * phi0, int x, int y, int z, int GRIDDIM);
+
+
+/**
+ * Iterates the navier stokes solver
+ * @return The cummulative normalized residual
+ */
+LIBRARY_API float solver_navier_stokes_iterate(float * phi, float * phi0, int GRIDDIM);
+
+
+#endif
\ No newline at end of file
diff --git a/src/main/c/src/math/ode/tuned/navier_stokes.c b/src/main/c/src/math/ode/tuned/navier_stokes.c
new file mode 100644
index 00000000..47c101b2
--- /dev/null
+++ b/src/main/c/src/math/ode/tuned/navier_stokes.c
@@ -0,0 +1,74 @@
+#include <math.h>
+
+#include "math/ode/tuned/navier_stokes.h"
+#include "math/ode/gauss_seidel.h"
+
+
+
+
+/**
+ * Calculates the residual for the approximation
+ */
+LIBRARY_API float solver_navier_stokes_get_residual(float * phi, float * phi0, int x, int y, int z, int GRIDDIM){
+    float c = 6.0f;
+    float laplacian = 
+    - (
+        phi[solver_gauss_seidel_get_index(x+1,y,z,GRIDDIM)] +
+        phi[solver_gauss_seidel_get_index(x-1,y,z,GRIDDIM)] +
+        phi[solver_gauss_seidel_get_index(x,y+1,z,GRIDDIM)] +
+        phi[solver_gauss_seidel_get_index(x,y-1,z,GRIDDIM)] +
+        phi[solver_gauss_seidel_get_index(x,y,z+1,GRIDDIM)] +
+        phi[solver_gauss_seidel_get_index(x,y,z-1,GRIDDIM)]
+    ) +
+    phi[solver_gauss_seidel_get_index(x,y,z,GRIDDIM)] * c;
+    float div = phi0[solver_gauss_seidel_get_index(x,y,z,GRIDDIM)];
+    return div - laplacian;
+}
+
+/**
+ * Calculates the residual for the approximation
+ */
+LIBRARY_API void solver_navier_stokes_approximate(float * phi, float * phi0, int x, int y, int z, int GRIDDIM){
+    float a = 1.0f;
+    float c = 6.0f;
+    phi[solver_gauss_seidel_get_index(x,y,z,GRIDDIM)] =
+    (
+        phi0[solver_gauss_seidel_get_index(x,y,z,GRIDDIM)] +
+        a * (
+            phi[solver_gauss_seidel_get_index(x-1,y,z,GRIDDIM)] +
+            phi[solver_gauss_seidel_get_index(x+1,y,z,GRIDDIM)] +
+            phi[solver_gauss_seidel_get_index(x,y-1,z,GRIDDIM)] +
+            phi[solver_gauss_seidel_get_index(x,y+1,z,GRIDDIM)] +
+            phi[solver_gauss_seidel_get_index(x,y,z-1,GRIDDIM)] +
+            phi[solver_gauss_seidel_get_index(x,y,z+1,GRIDDIM)]
+        )
+    ) / c;
+}
+
+
+/**
+ * Iterates the navier stokes solver
+ * @return The cummulative normalized residual
+ */
+LIBRARY_API float solver_navier_stokes_iterate(float * phi, float * phi0, int GRIDDIM){
+    int x, y, z;
+    float residual = 0;
+    float rLocal = 0;
+    for(z = 1; z < GRIDDIM-1; z++){
+        for(y = 1; y < GRIDDIM-1; y++){
+            for(x = 1; x < GRIDDIM-1; x++){
+                solver_navier_stokes_approximate(phi, phi0, x, y, z, GRIDDIM);
+            }
+        }
+    }
+    for(z = 1; z < GRIDDIM-1; z++){
+        for(y = 1; y < GRIDDIM-1; y++){
+            for(x = 1; x < GRIDDIM-1; x++){
+                rLocal = solver_navier_stokes_get_residual(phi,phi0,x,y,z,GRIDDIM);
+                residual = residual + rLocal * rLocal;
+            }
+        }
+    }
+    return (float)sqrt(residual);
+}
+
diff --git a/src/test/c/math/ode/tuned/navier_stokes_tests.c b/src/test/c/math/ode/tuned/navier_stokes_tests.c
new file mode 100644
index 00000000..c2962957
--- /dev/null
+++ b/src/test/c/math/ode/tuned/navier_stokes_tests.c
@@ -0,0 +1,265 @@
+#include <math.h>
+#include <stdlib.h>
+
+#include "math/ode/tuned/navier_stokes.h"
+#include "math/ode/gauss_seidel.h"
+#include "../../../util/test.h"
+
+#define NAVIER_STOKES_TESTS_ERROR_MARGIN 0.00001f
+#define NAVIER_STOKES_TESTS_MAX_ITERATIONS 500
+
+int math_ode_tuned_navier_stokes_test_residual(){
+    printf("math_ode_tuned_navier_stokes_test_residual \n");
+    int rVal = 0;
+    int GRIDDIM = 4;
+
+    float * phi = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float * phi0 = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float expected, actual;
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    expected = 1.0f;
+    actual = solver_navier_stokes_get_residual(phi,phi0,1,1,1,GRIDDIM);
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect residual!  expected: %f    actual: %f  \n");
+    }
+
+
+    //
+    //
+    //
+    phi[solver_gauss_seidel_get_index(2,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 2.0f;
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 0.0f;
+    expected = -10.0f;
+    actual = solver_navier_stokes_get_residual(phi,phi0,1,1,1,GRIDDIM);
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect residual!  expected: %f    actual: %f  \n");
+    }
+
+    //
+    //
+    //
+    phi[solver_gauss_seidel_get_index(2,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = -2.0f;
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 0.0f;
+    expected = 14.0f;
+    actual = solver_navier_stokes_get_residual(phi,phi0,1,1,1,GRIDDIM);
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect residual!  expected: %f    actual: %f  \n");
+    }
+
+    return rVal;
+}
+
+int math_ode_tuned_navier_stokes_test_approximation(){
+    printf("math_ode_tuned_navier_stokes_test_approximation \n");
+    int rVal = 0;
+    int GRIDDIM = 4;
+
+    float * phi = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float * phi0 = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float expected, actual;
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    expected = 0.166666f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    actual = phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)];
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect approximation!  expected: %f    actual: %f  \n");
+    }
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 0.0f;
+    expected = 0.166666f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    actual = phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)];
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect approximation!  expected: %f    actual: %f  \n");
+    }
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 0.0f;
+    phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)] = 1.0f;
+    expected = 0.3333333f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    actual = phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)];
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect approximation!  expected: %f    actual: %f  \n");
+    }
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)] = 1.0f;
+    expected = 0.333333f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    actual = phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)];
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect approximation!  expected: %f    actual: %f  \n");
+    }
+
+    return rVal;
+}
+
+int math_ode_tuned_navier_stokes_test_approximation_and_residual(){
+    printf("math_ode_tuned_navier_stokes_test_approximation_and_residual \n");
+    int rVal = 0;
+
+    int GRIDDIM = 4;
+    float * phi = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float * phi0 = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float expected, actual;
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    expected = 0.0f;
+    actual = solver_navier_stokes_get_residual(phi,phi0,1,1,1,GRIDDIM);
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect residual!  expected: %f    actual: %f  \n");
+    }
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)] = 1.0f;
+    expected = 0.0f;
+    solver_navier_stokes_approximate(phi,phi0,1,1,1,GRIDDIM);
+    actual = solver_navier_stokes_get_residual(phi,phi0,1,1,1,GRIDDIM);
+    if(fabs(expected - actual) > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal += assertEqualsFloat(expected,actual,"Calculated incorrect approximation!  expected: %f    actual: %f  \n");
+    }
+
+    return rVal;
+}
+
+int math_ode_tuned_navier_stokes_test_convergence_4(){
+    printf("math_ode_tuned_navier_stokes_test_convergence_4 \n");
+    int rVal = 0;
+
+    int GRIDDIM = 4;
+    float * phi = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float * phi0 = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float expected, actual;
+    int iteration = 0;
+    float residual = 1.0f;
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)] = 1.0f;
+    residual = 1.0f;
+    iteration = 0;
+    while(residual > NAVIER_STOKES_TESTS_ERROR_MARGIN && iteration < NAVIER_STOKES_TESTS_MAX_ITERATIONS){
+        residual = solver_navier_stokes_iterate(phi,phi0,GRIDDIM);
+        iteration++;
+    }
+    if(residual > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal++;
+        printf("Failed to converge! \n");
+        printf("Residual: %f \n", residual);
+        printf("iterations: %d \n",iteration);
+        printf("%f %f  \n", phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)], phi[solver_gauss_seidel_get_index(1,1,2,GRIDDIM)]);
+        printf("%f %f  \n", phi[solver_gauss_seidel_get_index(2,1,1,GRIDDIM)], phi[solver_gauss_seidel_get_index(2,1,2,GRIDDIM)]);
+        solver_navier_stokes_approximate(phi, phi0, 1, 1, 1, GRIDDIM);
+        printf("%f \n",phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)]);
+        printf("\n");
+    }
+
+    return rVal;
+}
+
+
+int math_ode_tuned_navier_stokes_test_convergence_6(){
+    printf("math_ode_tuned_navier_stokes_test_convergence_6 \n");
+    int rVal = 0;
+
+    int GRIDDIM = 6;
+    float * phi = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float * phi0 = (float *)calloc(1,GRIDDIM*GRIDDIM*GRIDDIM*sizeof(float));
+    float expected, actual;
+    int iteration = 0;
+    float residual = 1.0f;
+
+    //
+    //
+    //
+    phi0[solver_gauss_seidel_get_index(3,1,1,GRIDDIM)] = 1.0f;
+    phi0[solver_gauss_seidel_get_index(2,1,1,GRIDDIM)] = -1.0f;
+    for(int x = 0; x < GRIDDIM; x++){
+        for(int y = 0; y < GRIDDIM; y++){
+            for(int z = 0; z < GRIDDIM; z++){
+                phi[solver_gauss_seidel_get_index(x,y,z,GRIDDIM)] = 0;
+            }
+        }
+    }
+    residual = 1.0f;
+    iteration = 0;
+    while(residual > NAVIER_STOKES_TESTS_ERROR_MARGIN && iteration < NAVIER_STOKES_TESTS_MAX_ITERATIONS){
+        residual = solver_navier_stokes_iterate(phi,phi0,GRIDDIM);
+        //have to set borders for the iterator to work
+        for(int x = 0; x < GRIDDIM; x++){
+            for(int y = 0; y < GRIDDIM; y++){
+                phi[solver_gauss_seidel_get_index(0,x,y,GRIDDIM)] = phi[solver_gauss_seidel_get_index(1,x,y,GRIDDIM)];
+                phi[solver_gauss_seidel_get_index(x,0,y,GRIDDIM)] = phi[solver_gauss_seidel_get_index(x,1,y,GRIDDIM)];
+                phi[solver_gauss_seidel_get_index(x,y,0,GRIDDIM)] = phi[solver_gauss_seidel_get_index(x,y,1,GRIDDIM)];
+                phi[solver_gauss_seidel_get_index(GRIDDIM-1,x,y,GRIDDIM)] = phi[solver_gauss_seidel_get_index(GRIDDIM-2,x,y,GRIDDIM)];
+                phi[solver_gauss_seidel_get_index(x,GRIDDIM-1,y,GRIDDIM)] = phi[solver_gauss_seidel_get_index(x,GRIDDIM-2,y,GRIDDIM)];
+                phi[solver_gauss_seidel_get_index(x,y,GRIDDIM-1,GRIDDIM)] = phi[solver_gauss_seidel_get_index(x,y,GRIDDIM-2,GRIDDIM)];
+            }
+        }
+        iteration++;
+    }
+    if(residual > NAVIER_STOKES_TESTS_ERROR_MARGIN){
+        rVal++;
+        printf("Failed to converge! \n");
+        printf("Residual: %f \n", residual);
+        printf("iterations: %d \n",iteration);
+        printf("%f %f %f %f  \n", phi[solver_gauss_seidel_get_index(0,1,0,GRIDDIM)], phi[solver_gauss_seidel_get_index(1,1,0,GRIDDIM)], phi[solver_gauss_seidel_get_index(2,1,0,GRIDDIM)], phi[solver_gauss_seidel_get_index(3,1,0,GRIDDIM)]);
+        printf("%f %f %f %f  \n", phi[solver_gauss_seidel_get_index(0,1,1,GRIDDIM)], phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)], phi[solver_gauss_seidel_get_index(2,1,1,GRIDDIM)], phi[solver_gauss_seidel_get_index(3,1,1,GRIDDIM)]);
+        printf("%f %f %f %f  \n", phi[solver_gauss_seidel_get_index(0,1,2,GRIDDIM)], phi[solver_gauss_seidel_get_index(1,1,2,GRIDDIM)], phi[solver_gauss_seidel_get_index(2,1,2,GRIDDIM)], phi[solver_gauss_seidel_get_index(3,1,2,GRIDDIM)]);
+        printf("%f %f %f %f  \n", phi[solver_gauss_seidel_get_index(0,1,3,GRIDDIM)], phi[solver_gauss_seidel_get_index(1,1,3,GRIDDIM)], phi[solver_gauss_seidel_get_index(2,1,3,GRIDDIM)], phi[solver_gauss_seidel_get_index(3,1,3,GRIDDIM)]);
+        solver_navier_stokes_approximate(phi, phi0, 1, 1, 1, GRIDDIM);
+        printf("%f \n",phi[solver_gauss_seidel_get_index(1,1,1,GRIDDIM)]);
+        printf("\n");
+    }
+
+    return rVal;
+}
+
+
+int math_ode_tuned_navier_stokes_tests(){
+    int rVal = 0;
+
+    rVal += math_ode_tuned_navier_stokes_test_residual();
+    rVal += math_ode_tuned_navier_stokes_test_approximation();
+    rVal += math_ode_tuned_navier_stokes_test_approximation_and_residual();
+    rVal += math_ode_tuned_navier_stokes_test_convergence_4();
+    rVal += math_ode_tuned_navier_stokes_test_convergence_6();
+
+    return rVal;
+}
\ No newline at end of file