added saving and other stuff
not yet done