dwarf: more wip