boy i should rebase these