Daves fix on storyboard
Working on blocking, going to hackathon
Fixed crash