Nuked a lot of stuff, rethinking how to parse the files.