draft stories
update to report index page
Resolve conflicts and rebase to groups-sketch