Rectifying item controller issues
Merge?