Created new branch - for rewrite of the parser. To be merged when done.
Modified to do list