Bunch of 1.7 changes. Going to clean up the repo in a bit.