Commiting changes before I break more stuff