Ok, cooking up a new commit...