Interim check-in. Not working yet.
Another dump interim check-in
Finished implementing basic dumping.
Merge branch 'dump'