Progress on ffx refactor