Fleshed out some more of the basic plumbing - enrichers, filters and so-on.