Initial commit

May as well get the things working that we can while waiting for 1.7.10.