Compiling; tests failing.
Problems.
Fix some issues...
Tests pass using trivial update standin.
All tests pass with incremental updates. Refactoring complete.