Dwarf integration

Partially fixes #773. looks like http://i.imgur.com/vjUU5uA.jpg now.