Important progress

SEEMS to work
Some workaround with #20