More progress on fx engine