Lots of refactoring to make it easier to add cds, automatic name & icon fetching also added