stash
Feature complete for 1.8