updated parsing, working on tests