Finished parser, still needs testing