Starting to clean up some of the reused code
Some code cleanup batching, and adding for albums, artists and genres