Matrices in place

Matrices are set up, but we're not using them right yet.