[WIP] more work on field enrichment separation