I think the parse logic should now be moved to a separate file. This is a much bigger beast than what we had.