More granular dumping. Needs more though.
Cleanup. Hopefully works now.
Merge pull request #2 from risaacson/master

Update with Rich's new hotness.