Worked on save manager some more