renaming
scaffold
parser progress
more parser things