User stories and feature/scenarios draft 2