rearrange user stories, hopefully to better reflect our current position