More saving stuff

Making progress. Slowly. Shouldn't take too much longer.