halfway through fixing headers/namespaces