FIXME about argument order
Update and test
Support deletes, and test