will take a while to get both through ci, so no rush.