Commiting so @nolanfoster could actually do something even though hes a dick