Added the broken logic. Need to finish the updating in GameActivity to is just doesn't kill the activity.
SO MANY MERGING!