First pass for creating separate layers for features