Initial commit to namespaces branch