Lots of changes to the storyboards and code, having issues with data