Merge that compiles (factory commented out temporarily).