1366 dol parsing new

I think this branch could be merge without destroying too much. But I'm not finished yet with the DOL grammar.