more merge work
make things work with no game data.