More work on storyboard.