Reorganised the map and worked on turn validation