Basic saving and loadin
Fixed loading