Adds proper namespacing.
Uncomments code that was commented out in testing.