adding ability to do before/after filtering and better namespacing