Refactoring, working on turn sequence