in the middle of rewiring FPADD to use FPADDBase