Trying to remove storyboard dependency