Re-added basic save/load functionality (beware merge problems!)