Parser now almost works