Slightly better dump.
This is not working yet.