Namespacing - V2

Cleaned up comments and got it to work!