Fixed parser, ready to run now.