Start state refactoring
Split State into Round and State proper
Update state properly
Fix zero initial combo