complete change of approach - split by separator first