intermediate commit to push, removing parsing and fixing tests
commit at removing parsing, and merging data from pull