diff --git a/matrix_math.py b/matrix_math.py
new file mode 100644
index 0000000..4f4064b
--- /dev/null
+++ b/matrix_math.py
@@ -0,0 +1,65 @@
+
+class ShapeException(Exception):
+    pass
+
+
+class Vector:
+    def __init__(self, vector):
+        self.vector = vector
+
+
+
+    def shape(self):
+        try:
+            return (len(self.vector), len(self.vector[0]))
+        except TypeError:
+            return (len(self.vector), )
+
+
+    def vector_add(self, other):
+        if Vector.shape(self.vector) != Vector.shape(other.vector):
+            raise ShapeException()
+        return [self.vector[i] + other.vector[i] for i in range(len(self.vector))]
+
+
+    def vector_sub(self, other):
+        if shape(self.vector) != shape(self.other):
+            raise ShapeException()
+        return [self.vector[i] - other.vector[i] for i in range(len(self.vector))]
+
+
+    def vector_mult_by_scaler(self, scaler):
+        return [self.vector[i] * scalar for i in range(len(self.vector))]
+
+
+    def vector_dot(self, other):
+        if shape(self.vector) != shape(other.vector):
+            raise ShapeException()
+        return [self.vector[i] * other.vector[i] for i in range(len(self.vector))]
+
+
+    def vector_mag(self):
+        return math.sqrt(sum(self.vector[i]**2 for i in range(len(self.vector))))
+
+
+
+
+
+
+# class Matrix:
+#     def __init__(self, matrix):
+#         self.matrix = matrix
+#
+#     def shape(self):
+#
+#     def matrix_add(self, other):
+#
+#     def matrix_subtract(self, other):
+#
+#     def matrix_mult_scaler(self, scaler):
+#         return [[value * scaler for value in row] for row in matrix]
+#
+#
+#     def matrix_mult_vector(self, vector):
+#
+#     def matrix_mult(self, other):
diff --git a/test_matrix_math.py b/test_matrix_math.py
new file mode 100644
index 0000000..a99c8e7
--- /dev/null
+++ b/test_matrix_math.py
@@ -0,0 +1,251 @@
+
+from matrix_math import *
+from nose.tools import raises
+
+
+def is_equal(x, y, tolerance=0.001):
+    """Helper function to compare floats, which are often not quite equal
+    even when they should be."""
+    return abs(x - y) <= tolerance
+
+
+
+
+
+
+
+
+
+
+m = Vector([3, 4])
+ms = m.shape()
+n = Vector([5,0])
+ns = n.shape()
+
+v = Vector([1,3,0])
+vs = v.shape()
+w = Vector([0,2,4])
+ws = w.shape()
+u = Vector([1,1,1])
+us = u.shape()
+y = Vector([10,20,30])
+ys = y.shape()
+z = Vector([0,0,0])
+zs = z.shape()
+
+
+def test_shape_vectors():
+    """shape should take a vector or matrix and return a tuple with the
+    number of rows (for a vector) or the number of rows and columns
+    (for a matrix.)"""
+    assert m.shape() == (2,)
+    assert v.shape() == (3,)
+
+
+
+def test_vector_add():
+    """
+    [a b]  + [c d]  = [a+c b+d]
+
+    Matrix + Matrix = Matrix
+    """
+    assert v.vector_add(w) == [1, 5, 4]
+    assert u.vector_add(y) == [11, 21, 31]
+    assert u.vector_add(z) == u
+
+#
+# def test_vector_add_is_communicative():
+#     assert vector_add(w, y) == vector_add(y, w)
+#
+#
+# @raises(ShapeException)
+# def test_vector_add_checks_shapes():
+#     """Shape rule: the vectors must be the same size."""
+#     vector_add(m, v)
+#
+#
+# def test_vector_sub():
+#     """
+#     [a b]  - [c d]  = [a-c b-d]
+#
+#     Matrix + Matrix = Matrix
+#     """
+#     assert vector_sub(v, w) == [1, 1, -4]
+#     assert vector_sub(w, v) == [-1, -1, 4]
+#     assert vector_sub(y, z) == y
+#     assert vector_sub(w, u) == vector_sub(z, vector_sub(u, w))
+#
+#
+# @raises(ShapeException)
+# def test_vector_sub_checks_shapes():
+#     """Shape rule: the vectors must be the same size."""
+#     vector_sub(m, v)
+#
+#
+# def test_vector_sum():
+#     """vector_sum can take any number of vectors and add them together."""
+#     assert vector_sum(v, w, u, y, z) == [12, 26, 35]
+#
+#
+# @raises(ShapeException)
+# def test_vector_sum_checks_shapes():
+#     """Shape rule: the vectors must be the same size."""
+#     vector_sum(v, w, m, y)
+#
+#
+# def test_dot():
+#     """
+#     dot([a b], [c d])   = a * c + b * d
+#
+#     dot(Vector, Vector) = Scalar
+#     """
+#     assert dot(w, y) == 160
+#     assert dot(m, n) == 15
+#     assert dot(u, z) == 0
+#
+#
+# @raises(ShapeException)
+# def test_dot_checks_shapes():
+#     """Shape rule: the vectors must be the same size."""
+#     dot(v, m)
+#
+#
+# def test_vector_multiply():
+#     """
+#     [a b]  *  Z     = [a*Z b*Z]
+#
+#     Vector * Scalar = Vector
+#     """
+#     assert vector_multiply(v, 0.5) == [0.5, 1.5, 0]
+#     assert vector_multiply(m, 2) == [6, 8]
+#
+#
+# def test_vector_mean():
+#     """
+#     mean([a b], [c d]) = [mean(a, c) mean(b, d)]
+#
+#     mean(Vector)       = Vector
+#     """
+#     assert vector_mean(m, n) == [4, 2]
+#     assert vector_mean(v, w) == [0.5, 2.5, 2]
+#     assert is_equal(vector_mean(v, w, u)[0], 2 / 3)
+#     assert is_equal(vector_mean(v, w, u)[1], 2)
+#     assert is_equal(vector_mean(v, w, u)[2], 5 / 3)
+#
+#
+# def test_magnitude():
+#     """
+#     magnitude([a b])  = sqrt(a^2 + b^2)
+#
+#     magnitude(Vector) = Scalar
+#     """
+#     assert magnitude(m) == 5
+#     assert magnitude(v) == math.sqrt(10)
+#     assert magnitude(y) == math.sqrt(1400)
+#     assert magnitude(z) == 0
+#
+#
+# A = Matrix([[1, 0, 0],
+#      [0, 1, 0],
+#      [0, 0, 1]])
+# B = Matrix([[1, 2, 3],
+#      [4, 5, 6],
+#      [7, 8, 9]])
+# C = [[1, 2],
+#      [2, 1],
+#      [1, 2]]
+# D = [[1, 2, 3],
+#      [3, 2, 1]]
+#
+#
+# def test_shape_matrices():
+#     """shape should take a vector or matrix and return a tuple with the
+#     number of rows (for a vector) or the number of rows and columns
+#     (for a matrix.)"""
+#     assert shape(A) == (3, 3)
+#     assert shape(C) == (3, 2)
+#     assert shape(D) == (2, 3)
+#
+#
+# def test_matrix_row():
+#     """
+#            0 1  <- rows
+#        0 [[a b]]
+#        1 [[c d]]
+#        ^
+#      columns
+#     """
+#     assert matrix_row(A, 0) == [1, 0, 0]
+#     assert matrix_row(B, 1) == [4, 5, 6]
+#     assert matrix_row(C, 2) == [1, 2]
+#
+#
+# def test_matrix_col():
+#     """
+#            0 1  <- rows
+#        0 [[a b]]
+#        1 [[c d]]
+#        ^
+#      columns
+#     """
+#     assert matrix_col(A, 0) == [1, 0, 0]
+#     assert matrix_col(B, 1) == [2, 5, 8]
+#     assert matrix_col(D, 2) == [3, 1]
+#
+#
+# def test_matrix_scalar_multiply():
+#     """
+#     [[a b]   *  Z   =   [[a*Z b*Z]
+#      [c d]]              [c*Z d*Z]]
+#
+#     Matrix * Scalar = Matrix
+#     """
+#     assert matrix_scalar_multiply(C, 3) == [[3, 6],
+#                                             [6, 3],
+#                                             [3, 6]]
+#
+#
+# def test_matrix_vector_multiply():
+#     """
+#     [[a b]   *  [x   =   [a*x+b*y
+#      [c d]       y]       c*x+d*y
+#      [e f]                e*x+f*y]
+#
+#     Matrix * Vector = Vector
+#     """
+#     assert matrix_vector_multiply(A, [2, 5, 4]) == [2, 5, 4]
+#     assert matrix_vector_multiply(B, [1, 2, 3]) == [14, 32, 50]
+#     assert matrix_vector_multiply(C, [3, 4]) == [11, 10, 11]
+#     assert matrix_vector_multiply(D, [0, 1, 2]) == [8, 4]
+#
+#
+# @raises(ShapeException)
+# def test_matrix_vector_multiply_checks_shapes():
+#     """Shape Rule: The number of rows of the vector must equal the number of
+#     columns of the matrix."""
+#     matrix_vector_multiply(C, [1, 2, 3])
+#
+#
+# def test_matrix_matrix_multiply():
+#     """
+#     [[a b]   *  [[w x]   =   [[a*w+b*y a*x+b*z]
+#      [c d]       [y z]]       [c*w+d*y c*x+d*z]
+#      [e f]                    [e*w+f*y e*x+f*z]]
+#
+#     Matrix * Matrix = Matrix
+#     """
+#     assert matrix_matrix_multiply(A, B) == A
+#     assert matrix_matrix_multiply(B, C) == [[8, 10],
+#                                             [20, 25],
+#                                             [32, 40]]
+#     assert matrix_matrix_multiply(C, D) == [[7, 6, 5],
+#                                             [5, 6, 7],
+#                                             [7, 6, 5]]
+#     assert matrix_matrix_multiply(D, C) == [[8, 10], [8, 10]]
+#
+#
+# @raises(ShapeException)
+# def test_matrix_matrix_multiply_checks_shapes():
+#     """Shape Rule: The number of columns of the first matrix must equal the
+#     number of rows of the second matrix."""
+#     matrix_matrix_multiply(A, D)