Merging the master into item refactoring branch

forgot a class I needed