Refactor, Add menu
Merge game states