More saving updates

Framework set, now just needs implementation.