More reorg, prove model construction produces values.