[WIP]State diff #1

Closed
elizabethengelman wants to merge 12 commits from state-diff into master
12 Commits