Committing now because I am about to drive off and I want to have the code-base up to date before I travel.