Checking in code

As late as possible. Make sure the commit has plenty of changes in it.