WIP conversion to namespaces