Starting to rebuild the messiest rebase ever