I think I have everything… just working on the savedInstanceState