bootstrap upgrades, parser written
merging