Merged first attempt of the parser
TODO getting the use of git submodule down and merging pegged