Updated design matrix tools, scaffolding for alternative models.