Integrate WaitScreen and GameScreen

Have managed how to transfer data between screens