adding the work from natasha's branch. Unfortunately, merging didn't work. Therefor this commit includes all the work on the our-stories section