diff --git a/Math/Matrix/Matrix.php b/Math/Matrix/Matrix.php
index b373529b9..3ac9dbdbb 100644
--- a/Math/Matrix/Matrix.php
+++ b/Math/Matrix/Matrix.php
@@ -574,6 +574,7 @@ class Matrix implements \ArrayAccess, \Iterator
         return $newMatrix;
     }
 
+
     public function diagonalize() : Matrix
     {
         $newMatrix = new Matrix($this->m, $this->n);
@@ -582,6 +583,67 @@ class Matrix implements \ArrayAccess, \Iterator
         return $newMatrix;
     }
 
+    public function solve($b, int $algorithm) : Matrix
+    {
+        return $this->gaussElimination($b);
+    }
+
+    private function gaussElimination($b) : Matrix 
+    {
+        $mDim = count($b);
+        $matrix = $this->matrix;
+
+        for($col = 0; $col < $mDim; $col++) {
+            $j = $col;
+            $max = $matrix[$j][$j];
+
+            for ($i = $col + 1; $i < $mDim; $i++) {
+                $temp = abs($matrix[$i][$col]);
+
+                if ($temp > $max) {
+                    $j = $i;
+                    $max = $temp;
+                }
+            }
+     
+            if($col != $j) {
+                $temp = $matrix[$col];
+                $matrix[$col] = $matrix[$j];
+                $matrix[$j] = $temp;
+             
+                $temp = $b[$col];
+                $b[$col] = $b[$j];
+                $b[$j] = $temp;
+            }
+     
+            for ($i = $col + 1; $i < $mDim; $i++) {
+                $temp = $matrix[$i][$col] / $matrix[$col][$col];
+
+                for ($j = $col + 1; $j < $mDim; $j++) {
+                    $matrix[$i][$j] -= $temp * $matrix[$col][$j];
+                }
+
+                $matrix[$i][$col] = 0;
+                $b[$i] -= $temp * $b[$col];
+            }
+        }
+
+        $x = [];
+        for ($col = $mDim - 1; $col >= 0; $col--) {
+            $temp = $b[$col];
+            for ($j = $mDim - 1; $j > $col; $j--) {
+                $temp -= $x[$j] * $matrix[$col][$j];
+            }
+
+            $x[$col] = $temp / $matrix[$col][$col];
+        }
+
+        $solution = new self(count($x), count($x[0]));
+        $solution->setMatrix($x);
+
+        return $solution;
+    }
+
     /**
      * Diagonalize matrix.
      *
diff --git a/Math/Optimization/GaussianElimination.php b/Math/Optimization/GaussianElimination.php
deleted file mode 100644
index 67c2ca4cc..000000000
--- a/Math/Optimization/GaussianElimination.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * Orange Management
- *
- * PHP Version 7.0
- *
- * @category   TBD
- * @package    TBD
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @copyright  2013 Dennis Eichhorn
- * @license    OMS License 1.0
- * @version    1.0.0
- * @link       http://orange-management.com
- */
-namespace phpOMS\Math\Optimization;
-
-use phpOMS\Math\Matrix\Matrix;
-
-/**
- * Gaussian elimination class
- *
- * @category   Framework
- * @package    phpOMS\Math\Matrix
- * @author     OMS Development Team <dev@oms.com>
- * @author     Dennis Eichhorn <d.eichhorn@oms.com>
- * @license    OMS License 1.0
- * @link       http://orange-management.com
- * @since      1.0.0
- */
-class GaussianElimination
-{
-    /**
-     * Solve equation with gaussian elimination.
-     *
-     * @param Matrix $A Matrix A
-     * @param Matrix $b Vector b
-     *
-     * @return Matrix
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    public static function solve(Matrix $A, Matrix $b) : Matrix
-    {
-        $limit = min($A->getM(), $A->getN());
-        $A     = $A->getMatrix();
-        $b     = $b->getMatrix();
-
-        for ($col = 0; $col < $limit; $col++) {
-            $j   = $col;
-            $max = $A[$j][$j];
-
-            for ($i = $col + 1; $i < $limit; $i++) {
-                $tmp = abs($A[$i][$col]);
-
-                if ($tmp > $max) {
-                    $j   = $i;
-                    $max = $tmp;
-                }
-            }
-
-            self::swapRows($A, $b, $col, $j);
-
-            for ($i = $col + 1; $i < $limit; $i++) {
-                $tmp = $A[$i][$col] / $A[$col][$col];
-
-                for ($j = $col + 1; $j < $limit; $j++) {
-                    $A[$i][$j] -= $tmp * $A[$col][$j];
-                }
-
-                $A[$i][$col] = 0;
-                $b[$i] -= $tmp * $b[$col];
-            }
-        }
-
-        $x = [];
-        for ($col = $limit - 1; $col >= 0; $col--) {
-            $tmp = $b[$col];
-
-            for ($j = $limit - 1; $j > $col; $j--) {
-                $tmp -= $x[$j] * $A[$col][$j];
-            }
-
-            $x[$col] = $tmp / $A[$col][$col];
-        }
-
-        $Y = new Matrix(count($x), 1);
-        $Y->setMatrix($x);
-
-        return $Y;
-    }
-
-    /**
-     * Swap rows.
-     *
-     * @param array $a  Matrix A
-     * @param array $b  Vector b
-     * @param int   $r1 Row 1
-     * @param int   $r2 Row 2
-     *
-     * @return void
-     *
-     * @since  1.0.0
-     * @author Dennis Eichhorn <d.eichhorn@oms.com>
-     */
-    private static function swapRows(&$a, &$b, int $r1, int $r2)
-    {
-        if ($r1 == $r2) {
-            return;
-        }
-
-        $tmp    = $a[$r1];
-        $a[$r1] = $a[$r2];
-        $a[$r2] = $tmp;
-
-        $tmp    = $b[$r1];
-        $b[$r1] = $b[$r2];
-        $b[$r2] = $tmp;
-    }
-}
\ No newline at end of file
diff --git a/Math/Optimization/GeneticAlgorithmInterface.php b/Math/Optimization/GeneticAlgorithmInterface.php
new file mode 100644
index 000000000..0f817bc0a
--- /dev/null
+++ b/Math/Optimization/GeneticAlgorithmInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 7.0
+ *
+ * @category   TBD
+ * @package    TBD
+ * @author     OMS Development Team <dev@oms.com>
+ * @author     Dennis Eichhorn <d.eichhorn@oms.com>
+ * @copyright  2013 Dennis Eichhorn
+ * @license    OMS License 1.0
+ * @version    1.0.0
+ * @link       http://orange-management.com
+ */
+namespace phpOMS\Math\Optimization;
+
+/**
+ * Web module interface.
+ *
+ * @category   Framework
+ * @package    phpOMS\Module
+ * @author     OMS Development Team <dev@oms.com>
+ * @author     Dennis Eichhorn <d.eichhorn@oms.com>
+ * @license    OMS License 1.0
+ * @link       http://orange-management.com
+ * @since      1.0.0
+ */
+interface GeneticAlgorithmInterface
+{
+	public function mutate($a);
+
+	public function unfitness($a, $b);
+}