Hm.  Don't really like this namespacing...