Making sure this is committed. Haven't looked at this code in a couple weeks