Starting to add turn management