Lps 52298

Ok, I've reordered the commits. I'm sending you the whole thing so you can just send Brian the pieces as he accepts them. Let me know if you want me to adjust anything else, but I probably won't get back to you until 1/2