Updated with working fragments, still need savedInstanceStates and updated Singleton