Initial work from Mark grokking the dwarf structures.