Done commenting on the rest. Now I just have to get through the tests! It would have been nice if the changes here were broken into a few logical commits.