Refactor list merging into its own class, and get things working.