I'm working on the implementation of these two methods, but pushed so we can get the big namespacing changes in.