Finish much of the heavy lifting on DesignMatrix