Stash support, WIP

Stash support working for demo.  Not ready for production or merge.