start game commit + some refactor