Continue work on data model and storyboard