Reverting game flow back to what it was

We can move it back if needed by looking back into the commits