Refactoring
Compiles, but fails first simple test
WIP on Dot parser