Restructure, add new TurnHandler