Finished the parser - am yet to test