cleaning up
ugly version of save/load working