Changes for Story 1

Pull changes for story1