Refactored artist, added stuff