More refactoring..
Added iPods to the list