Multiple dwarves

This, I'm pretty sure, is all the changes I made to the client code