@caroline refactor wad parser