broken stage, but on on track
incorporated major parse changes