completed beta version of parser