Storyboards updated, main class structure done