Varstash integration

This is based on my "improvements" branch.