Hopefully getting ready to use shadows as the only final state model, which means cutting away a lot of dead meat. Hence a new branch.