fixored Matrix derpism; next step: use moar matrices