That stuff I said I did in the last commit? I actually did it this time...