New parser structure, couldn't test because was interrupted for beers (dammit).