Add CFP and whatnot