Adding first finished version of parser