Commit all work leading up to the matrix logic, one test written without implementation