Updated thoughts on optimistic locking, something we can probably add some helper classes for