getting closer to fixing saving