New stuff

This should just go away rather then be commented out.  Same for other parts of this PR.