wrote load/store with update
Merge branch 'john' of https://github.com/mammothbane/wave-stable into john