Updated the todo to clarify that the namespaces used here will probably change.