Properly implement namespace handling.  Stomping bugs