Basic changes to save files

Here are some basic changes that allow incorpration of saving.