Finished working on initial version of a parser