Second pass at implementing per query namespaces!