Added first take on NamespaceHandler