Hopefully this breaks some things and fixes some things.