turf refactor update 1st draft