Stash support

Bringing #198 up to date and fixing up review notes.