It's ok to push this off to your next branch. Ideally no code for the character selection and game setup screen would be included in the PR as it's not complete.