Refactoring most of the list parsing into one file.