Updated lots of stuff in the parser
Initial parsing done