Flesh out more matrix stuff.