Cleaned up unneeded files/storyboard added better data mangement

@drnick23 
I can merge if it looks good to you.