refactor step 1
refactor step 2
last step refactor + discogs support