Working towards real dump implementation (not finished)
Working toward implementation of dump
Merged changes form laptop