Start separating out datasources
Add surey layers