Adding WFO to existing BBQ build