Beginning work of consolidating to single Storyboard