Moved some constant values into the object, switched to a matrix of bools instead of ints