Experiment w/automatic optimistic updates
Merge branch 'next-rollback' into next
Move backbone adapters to a sensible place.