diff --git a/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java b/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java
index ddc87c8..2e7434d 100644
--- a/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java
+++ b/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java
@@ -262,27 +262,6 @@ public int mapToAlarmDays(int calendarDay) {
         }
     }
 
-//    public int mapToCalendarDays(int alarmDay) {
-//        switch (alarmDay) {
-//            case 1:
-//                return Calendar.SUNDAY;
-//            case 2:
-//                return Calendar.MONDAY;
-//            case 4:
-//                return Calendar.TUESDAY;
-//            case 8:
-//                return Calendar.WEDNESDAY;
-//            case 16:
-//                return Calendar.THURSDAY;
-//            case 32:
-//                return Calendar.FRIDAY;
-//            case 64:
-//                return Calendar.SATURDAY;
-//            default:
-//                return 0;
-//        }
-//    }
-
     public int getDecDaysOfWeek() {
         return (daysOfWeek != null) ? Integer.parseInt(daysOfWeek, 2) : 0;
     }
diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java b/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java
index 1077ca2..7063c41 100644
--- a/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java
+++ b/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java
@@ -21,6 +21,8 @@ public class WakeRecyclerViewAdapter extends RecyclerView.Adapter<WakeRecyclerVi
     private static String TAG = WakeRecyclerViewAdapter.class.getSimpleName();
     private Alarm alarm;
     private NextMediaListener nextMediaListener;
+    private String trackName;
+    private String artistName;
 
     public WakeRecyclerViewAdapter(Alarm alarm, NextMediaListener nextMediaListener){
         this.alarm = alarm;
@@ -40,8 +42,17 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         Log.d(TAG, "BindViewHolder");
-        holder.mediaName.setText(alarm.getTrackName());
-        holder.mediaOwner.setText(alarm.getArtistName());
+        if (trackName != null) {
+            holder.mediaName.setText(trackName);
+        } else {
+            holder.mediaName.setText(alarm.getTrackName());
+        }
+
+        if (artistName != null) {
+            holder.mediaOwner.setText(artistName);
+        } else {
+            holder.mediaOwner.setText(alarm.getArtistName());
+        }
         holder.nextSong.setOnClickListener(view -> nextMediaListener.onNextSong());
     }
 
@@ -60,6 +71,12 @@ public void onAlarmSnooze(int position) {
         notifyItemRemoved(position);
     }
 
+    public void updateMediaInfo(String track, String artist) {
+        this.artistName = artist;
+        this.trackName = track;
+        this.notifyDataSetChanged();
+    }
+
     public class ViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.wake_card) CardView cardView;
         @BindView(R.id.wake_media_name) TextView mediaName;
diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java
index a9d38fb..a5779e3 100644
--- a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java
+++ b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java
@@ -7,6 +7,7 @@
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.nfc.Tag;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
@@ -43,6 +44,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
 
 import javax.inject.Inject;
 
@@ -78,6 +80,7 @@ public class WakeActivity extends BaseActivity implements ConnectionStateCallbac
     private static final int REQUEST_CODE = 5123;
     private static final String REDIRECT_URI = "vivify://callback";
     private Player mPlayer;
+    private Metadata metadata;
     private Config playerConfig;
     private ApplicationModule applicationModule = new ApplicationModule((AlarmApplication) getApplication());
     private String trackId;
@@ -156,12 +159,7 @@ public void onError(Error error) {
 //            mediaInfo.setText(alarm.getArtistName()+": " + alarm.getTrackName());
 
             //Use Glide to load image URL
-            trackIV.setScaleType(ImageView.ScaleType.FIT_XY);
-            Glide.with(this)
-                    .load(trackImage)
-                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
-                    .centerCrop()
-                    .into(trackIV);
+            updateBackgroundImage(trackImage);
 
             Log.d("trackImage", "Traack Image Url: " + trackImage);
 
@@ -191,6 +189,15 @@ public void onError(Error error) {
 
     }
 
+    private void updateBackgroundImage(String imageUri) {
+        trackIV.setScaleType(ImageView.ScaleType.FIT_XY);
+        Glide.with(this)
+                .load(imageUri)
+                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                .centerCrop()
+                .into(trackIV);
+    }
+
     private void attachAdaptersToRecyclerview() {
         nextMediaListener = () -> onNextSongClick();
         wakeAdapterRecyclerViewAdapter = new WakeRecyclerViewAdapter(alarm, nextMediaListener);
@@ -204,6 +211,8 @@ public void onAlarmDismissed() {
             public void onAlarmSnoozed() {
                 onSnooze();
             }
+
+
         };
         ItemTouchHelper.Callback callback = new WakeTouchAdapter(touchListener);
         ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
@@ -644,12 +653,23 @@ protected void onDestroy() {
 
     @Override
     public void onPlaybackEvent(PlayerEvent event) {
-
+        switch (event) {
+            case kSpPlaybackNotifyTrackChanged:
+                updateView(mPlayer.getMetadata());
+                break;
+            default:
+                break;
+        }
     }
 
+    private void updateView(Metadata metadata) {
+        updateBackgroundImage(metadata.currentTrack.albumCoverWebUrl);
+        wakeAdapterRecyclerViewAdapter
+                .updateMediaInfo(metadata.currentTrack.name, metadata.currentTrack.artistName);
+    }
 
     @Override
     public void onPlaybackError(com.spotify.sdk.android.player.Error error) {
-
+        Log.d(TAG, "Error: " + error);
     }
 }