Start refactoring items (warning: this commit breaks selection)