updated stories and fiddling with wireframes
merge conflict fix