Lot of work on parsing

- Damn, I'll never write parsers again!