Gah, kindof a frustrating commit