Move stash retreival logic out of StashForm