   }
   
   //*****************************************************************
-  // MARK: - Album Art
-  //*****************************************************************
-  
-  func resetAlbumArtwork() {
-    earbitsTrack!.artworkLoaded = false
-    updateAlbumArtwork()
-    stationDescLabel.hidden = false
-  }
-  
-  func updateAlbumArtwork() {
-    earbitsTrack!.artworkLoaded = false
-    if earbitsTrack!.artist.artistImageURL.rangeOfString("http") != nil {
+  // MARK: - Artist Image
+  //*****************************************************************
+  
+  func animateArtistImage() {
+    // Animate artwork
+    self.albumImageView.animation = "wobble"
+    self.albumImageView.duration = 2
+    self.albumImageView.animate()
+    self.stationDescLabel.hidden = true
+    
+    // Update lockscreen
+    self.updateLockScreen()
+    
+    // Call delegate function that artwork updated
+    self.delegate?.artworkDidUpdate(self.earbitsTrack!)
+  }
+  
+  func updateArtistImage() {
+    if (earbitsTrack!.artworkLoaded && (self.earbitsTrack!.artist.artworkImage != nil)) {
+      // use cached image
+      self.albumImageView.image = self.earbitsTrack!.artist.artworkImage!
+      self.animateArtistImage()
+    } else if earbitsTrack!.artist.artistImageURL.rangeOfString("http") != nil {
       
       // Hide station description
       dispatch_async(dispatch_get_main_queue()) {

        self.stationDescLabel.hidden = false
      }
      
      // Attempt to download album art from an API
      if let url = NSURL(string: earbitsTrack!.artist.artistImageURL) {
        
        self.downloadTask = self.albumImageView.loadImageWithURL(url) { (image) in
          
          // Update track struct
          self.earbitsTrack!.artist.artworkImage = image
          self.earbitsTrack!.artworkLoaded = true
          
          // Turn off network activity indicator
          UIApplication.sharedApplication().networkActivityIndicatorVisible = false
          
          // Animate artwork
          self.albumImageView.animation = "wobble"
          self.albumImageView.duration = 2
          self.albumImageView.animate()
          self.stationDescLabel.hidden = true
          
          // Update lockscreen
          self.updateLockScreen()
          
          // Call delegate function that artwork updated
          self.delegate?.artworkDidUpdate(self.earbitsTrack!)
        }
      }
      
      // Hide the station description to make room for album art
      if earbitsTrack!.artworkLoaded && !self.justBecameActive {
        self.stationDescLabel.hidden = true
        self.justBecameActive = false
      }
      
    } else if earbitsTrack!.artist.artistImageURL != "" {

    // Setup handoff functionality - GH
    setupUserActivity()
    
    // Set ArtistImage Constraints
    optimizeForDeviceSize()
    
    self.trackList = TrackList()
