Big refactoring. Moving Item creation to a factory