more work on user stories