WIP on namespaces
Namespaces working now
Merge branch 'namespaces'