Moved dump to main file. Only need dump methods now