Actually return something
Cleaned up Namespacing stuff a bit