Rewrite parser in the future

[john-bv]

The parser, is "ok" but should be improved to remove code repetition and allow for parser plugins