mostly finished first-pass matrix definitions