Updated Save and Load code (semi works thanks to Andrew)