Refactor to get players into games sooner