Cleaned up a lot of the unnecessary dicts - added in items saving