Stash changes

Decide to implement new storage scheme without higher order transitions
first, before adding them back in if needed.