Kind of messy right now, but has the latest matrix additions