Committing everything before refactoring sub

I want to have the gamestate object hold all the items, instead of
wrapping them in a sub.... commit everything!