WIP list and stash sorting

TEST