Added namespace state.
Moving to rename.
Added start of support for namespaces.

aka just comment them out for now.