Resolving both albums and artists works now!

After more refactorings and plays and toys