Finishing up matrix class