Small refactor with stash trait

Not sure if it's worth merging, but I was playing with the stash trait yesterday and though brando would be a good use case.