added TODO and removed a couple namespaces