Remove duplicate story
Update feature
Flesh out feature with new scenarios and make a start on new booking form steps