Updated Matrix Class (Broken)