Parser progress!

Parser matches testparse as commited!