hm, well, got the namespaces sorted out

not sure what was wrong that broke it, but it's in the stashes