Bringing in more stuff from the old pipeline, making sure it parses on my computer.