switching storyboard
working on save functionality
fixed merge conflicts