Preliminary investigation of parsing less aggressively

Parser still overgeneralizes but working on making it do so less...