I'm sorry to change all these files a little, and especially for basically commenting out a lot of stuff.  My objective was to have a commit that compiles without having to fix every single dependency.  Now we can uncomment them as they begin to function, hopefully, and be in good shape from here out.