Build out dump feature. Non tested