Work on refectoring the FX component into v3