Feature/71 itemscontroller