Modified all namespaces, everything working.

TODO: add final user functionality