simplified data model, removed usernames
merged storyboard