Need to rework how the scene change is handled