diff --git a/matrix.c b/matrix.c
index 59aa506..0f5944d 100644
--- a/matrix.c
+++ b/matrix.c
@@ -1,17 +1,47 @@
 #include <stdlib.h>
 #include <string.h>
 #include "matrix.h"
+#include <stdio.h>
 
 // TODO Matrix-Funktionen implementieren ...  ok
 
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
-    
+   Matrix matrix;
+
+   if (rows == 0 || cols == 0)
+    {
+        matrix.rows = 0;
+        matrix.cols =0;
+        matrix.data = NULL;
+        return matrix;
+    }
+    matrix.rows = rows;
+    matrix.cols = cols;
+
+    matrix.data = (MatrixTyype *)malloc(rows * cols * sizeof(MatrixType));
+
+    if (matrix.data == NULL)
+    {
+        matrix.rows = 0;
+        matrix.cols = 0;
+
+        return matrix;
+    }
+
+    for (int i = 0; i<rows; i++)
+    {
+        for (int j = 0; j<cols; j++)
+        {
+            matrix.data[i * matrix.cols +j] = UNDEFINED_MATRIX_VALUE;
+        }
+    }
+    return matrix;
 }
 
 void clearMatrix(Matrix *matrix)
 {
-    
+
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
diff --git a/matrix.h b/matrix.h
index cc640d1..55e728a 100644
--- a/matrix.h
+++ b/matrix.h
@@ -7,6 +7,13 @@ typedef float MatrixType;
 
 // TODO Matrixtyp definieren
 
+typedef struct Matrix
+{
+    unsigend int rows;
+    unsigned int cols;
+    Matrixtype *data;
+    #define buffer data    
+} Matrix;
 
 Matrix createMatrix(unsigned int rows, unsigned int cols);
 void clearMatrix(Matrix *matrix);