Pull Saves into their own class

And rename some variables while I'm at it.