Use namespaces, first draft