added saving stuff
merge