Problems.
Fix some issues...
Tests pass using trivial update standin.