change to using namespaces, test not working
bugfixes