added first version of parser