Oops, adding the stuff I said I'd add in the last commit.