Bunch of stuff working again.. Sacrificed some metadata on tokens in parse.py