[WIP] finishing up simple field enrichments