Refactor Namespaces with returns to allow redirects
Complete all requirements