Add /save and make /load more robust