First pass at porting to storyboards