Refactor shared bits of *-saves?
Update .gitignore
Merge branch 'wrd/refactor-reserves-move'