Refactored item handling to own class.