Start to improve parsing...

..still lots of issues with pits handling…
Large commit of multiple new functions