Started writing the meat of the parser
Tweak