Incremental Update

Now essentially ready to generalize variable building stage.