diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index fe08d54..ef38a3b 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -45,8 +45,6 @@ lazy_static! {
 #[derive(Debug, Clone)]
 pub struct EpisodeWidget {
     pub container: gtk::Box,
-    play: gtk::Button,
-    download: gtk::Button,
     cancel: gtk::Button,
     title: Arc<Mutex<TitleMachine>>,
     date: gtk::Label,
@@ -54,8 +52,6 @@ pub struct EpisodeWidget {
     progress: gtk::ProgressBar,
     total_size: gtk::Label,
     local_size: gtk::Label,
-    separator2: gtk::Label,
-    prog_separator: gtk::Label,
     media: Arc<Mutex<MediaMachine>>,
 }
 
@@ -98,16 +94,12 @@ impl Default for EpisodeWidget {
         EpisodeWidget {
             container,
             progress,
-            download,
-            play,
             cancel,
+            total_size,
+            local_size,
             title: title_machine,
             duration: duration_machine,
             date,
-            total_size,
-            local_size,
-            separator2,
-            prog_separator,
             media: media_machine,
         }
     }
@@ -136,8 +128,8 @@ impl EpisodeWidget {
             error!("Failed to set duration state: {}", err);
         }
 
-        // Determine what the state of the progress bar should be.
-        if let Err(err) = self.determine_progess_bar(&episode) {
+        // Determine what the state of the media widgets should be.
+        if let Err(err) = self.determine_media_state(&episode) {
             error!("Something went wrong determining the ProgressBar State.");
             error!("Error: {}", err);
         }
@@ -203,7 +195,7 @@ impl EpisodeWidget {
 
     // FIXME: REFACTOR ME
     // Something Something State-Machine?
-    fn determine_progess_bar(&self, episode: &EpisodeWidgetQuery) -> Result<(), Error> {
+    fn determine_media_state(&self, episode: &EpisodeWidgetQuery) -> Result<(), Error> {
         let id = WidgetExt::get_name(&self.container)
             .ok_or_else(|| format_err!("Failed to get widget Name"))?
             .parse::<i32>()?;
@@ -216,13 +208,17 @@ impl EpisodeWidget {
             Ok(m.get(&id).cloned())
         }()?;
 
+        let mut lock = self.media.lock().map_err(|err| format_err!("{}", err))?;
+        take_mut::take(lock.deref_mut(), |media| {
+            media.determine_state(
+                episode.length(),
+                active_dl.is_some(),
+                episode.local_uri().is_some(),
+            )
+        });
+
         // Show or hide the play/delete/download buttons upon widget initialization.
         if let Some(prog) = active_dl {
-            let mut lock = self.media.lock().map_err(|err| format_err!("{}", err))?;
-            take_mut::take(lock.deref_mut(), |media| {
-                media.determine_state(episode.length(), true, episode.local_uri().is_some())
-            });
-
             let progress_bar = self.progress.clone();
             let total_size = self.total_size.clone();
             let local_size = self.local_size.clone();
@@ -241,11 +237,6 @@ impl EpisodeWidget {
                     cancel.set_sensitive(false);
                 }
             }));
-        } else {
-            let mut lock = self.media.lock().map_err(|err| format_err!("{}", err))?;
-            take_mut::take(lock.deref_mut(), |media| {
-                media.determine_state(episode.length(), false, episode.local_uri().is_some())
-            });
         }
 
         Ok(())
diff --git a/hammond-gtk/src/widgets/episode_states.rs b/hammond-gtk/src/widgets/episode_states.rs
index 9e90f9a..c516d7d 100644
--- a/hammond-gtk/src/widgets/episode_states.rs
+++ b/hammond-gtk/src/widgets/episode_states.rs
@@ -452,58 +452,32 @@ pub struct Media<X, Y, Z> {
     progress: Progress<Z>,
 }
 
-type New<Y: Visibility> = Media<Download, Y, Hidden>;
-type Playable<Y: Visibility> = Media<Play, Y, Hidden>;
+type New<Y> = Media<Download, Y, Hidden>;
+type Playable<Y> = Media<Play, Y, Hidden>;
 type InProgress = Media<Hidden, Shown, Shown>;
 type MediaUnInitialized = Media<UnInitialized, UnInitialized, UnInitialized>;
 
 impl From<New<Shown>> for InProgress {
     fn from(f: New<Shown>) -> Self {
-        Media {
-            dl: f.dl.into_hidden(),
-            size: f.size.into_shown(),
-            progress: f.progress.into_shown(),
-        }
+        f.into_progress()
     }
 }
 
 impl From<New<Hidden>> for InProgress {
     fn from(f: New<Hidden>) -> Self {
-        Media {
-            dl: f.dl.into_hidden(),
-            size: f.size.set_size("Unkown"),
-            progress: f.progress.into_shown(),
-        }
+        f.into_progress()
     }
 }
 
 impl From<Playable<Shown>> for InProgress {
     fn from(f: Playable<Shown>) -> Self {
-        Media {
-            dl: f.dl.into_hidden(),
-            size: f.size.into_shown(),
-            progress: f.progress.into_shown(),
-        }
+        f.into_progress()
     }
 }
 
 impl From<Playable<Hidden>> for InProgress {
     fn from(f: Playable<Hidden>) -> Self {
-        Media {
-            dl: f.dl.into_hidden(),
-            size: f.size.set_size("Unkown"),
-            progress: f.progress.into_shown(),
-        }
-    }
-}
-
-impl From<MediaUnInitialized> for InProgress {
-    fn from(f: MediaUnInitialized) -> Self {
-        Media {
-            dl: f.dl.into_hidden(),
-            size: f.size.into_shown(),
-            progress: f.progress.into_shown(),
-        }
+        f.into_progress()
     }
 }
 
@@ -548,13 +522,13 @@ impl From<MediaUnInitialized> for Playable<Hidden> {
 }
 
 impl<X, Y, Z> Media<X, Y, Z> {
-    fn set_size(self, s: &str) -> Media<X, Shown, Z> {
-        Media {
-            dl: self.dl,
-            size: self.size.set_size(s),
-            progress: self.progress,
-        }
-    }
+    // fn set_size(self, s: &str) -> Media<X, Shown, Z> {
+    //     Media {
+    //         dl: self.dl,
+    //         size: self.size.set_size(s),
+    //         progress: self.progress,
+    //     }
+    // }
 
     fn hide_size(self) -> Media<X, Hidden, Z> {
         Media {
@@ -581,6 +555,44 @@ impl<X, Y, Z> Media<X, Y, Z> {
     }
 }
 
+impl<X, Z> Media<X, Shown, Z> {
+    fn into_progress(self) -> InProgress {
+        Media {
+            dl: self.dl.into_hidden(),
+            size: self.size.into_shown(),
+            progress: self.progress.into_shown(),
+        }
+    }
+}
+
+impl<X, Z> Media<X, Hidden, Z> {
+    fn into_progress(self) -> InProgress {
+        Media {
+            dl: self.dl.into_hidden(),
+            size: self.size.set_size("Unkown"),
+            progress: self.progress.into_shown(),
+        }
+    }
+}
+
+impl<X, Z> Media<X, UnInitialized, Z> {
+    fn into_progress(self, size: Option<String>) -> InProgress {
+        if let Some(s) = size {
+            Media {
+                dl: self.dl.into_hidden(),
+                size: self.size.set_size(&s),
+                progress: self.progress.into_shown(),
+            }
+        } else {
+            Media {
+                dl: self.dl.into_hidden(),
+                size: self.size.set_size("Unkown"),
+                progress: self.progress.into_shown(),
+            }
+        }
+    }
+}
+
 #[derive(Debug, Clone)]
 pub enum ButtonsState {
     New(Media<Download, Shown, Hidden>),
@@ -595,20 +607,14 @@ impl ButtonsState {
 
         match (self, size, is_downloaded) {
             // From whatever to New
-            (b @ New(_), None, false) => b,
             (New(m), Some(s), false) => New(m.into_new(&s)),
-
-            (Playable(m), None, false) => New(m.into()),
             (Playable(m), Some(s), false) => New(m.into_new(&s)),
 
             (NewWithoutSize(m), Some(s), false) => New(m.into_new(&s)),
             (PlayableWithoutSize(m), Some(s), false) => New(m.into_new(&s)),
 
             // From whatever to Playable
-            (New(m), None, true) => Playable(m.into()),
             (New(m), Some(s), true) => Playable(m.into_playable(&s)),
-
-            (b @ Playable(_), None, true) => b,
             (Playable(m), Some(s), true) => Playable(m.into_playable(&s)),
 
             (NewWithoutSize(m), Some(s), true) => Playable(m.into_playable(&s)),
@@ -617,18 +623,31 @@ impl ButtonsState {
             // From whatever to NewWithoutSize
             (New(m), None, false) => NewWithoutSize(m.hide_size()),
             (Playable(m), None, false) => NewWithoutSize(Media::from(m).hide_size()),
+
             (b @ NewWithoutSize(_), None, false) => b,
             (PlayableWithoutSize(m), None, false) => NewWithoutSize(m.into()),
 
             // From whatever to PlayableWithoutSize
             (New(m), None, true) => PlayableWithoutSize(Media::from(m).hide_size()),
             (Playable(m), None, true) => PlayableWithoutSize(Media::from(m).hide_size()),
+
             (NewWithoutSize(val), None, true) => PlayableWithoutSize(val.into()),
             (b @ PlayableWithoutSize(_), None, true) => b,
             // _ => unimplemented!()
         }
     }
 
+    pub fn into_progress(self) -> InProgress {
+        use self::ButtonsState::*;
+
+        match self {
+            New(m) => m.into(),
+            Playable(m) => m.into(),
+            NewWithoutSize(m) => m.into(),
+            PlayableWithoutSize(m) => m.into(),
+        }
+    }
+
     pub fn download_connect_clicked<F: Fn(&gtk::Button) + 'static>(
         &self,
         f: F,
@@ -723,23 +742,20 @@ impl MediaMachine {
             s.file_size(SIZE_OPTS.clone()).ok()
         };
 
-        if is_active {
-            match (self, size_helper()) {
-                _ => unimplemented!(),
-            }
-        } else {
-            match (self, size_helper(), is_downloaded) {
-                // Into New
-                (UnInitialized(m), Some(s), false) => Initialized(New(m.into_new(&s))),
-                (UnInitialized(m), None, false) => Initialized(NewWithoutSize(m.into())),
+        match (self, size_helper(), is_downloaded, is_active) {
+            (UnInitialized(m), s, _, true) => InProgress(m.into_progress(s)),
 
-                // Into Playable
-                (UnInitialized(m), Some(s), true) => Initialized(Playable(m.into_playable(&s))),
-                (UnInitialized(m), None, true) => Initialized(PlayableWithoutSize(m.into())),
+            // Into New
+            (UnInitialized(m), Some(s), false, false) => Initialized(New(m.into_new(&s))),
+            (UnInitialized(m), None, false, false) => Initialized(NewWithoutSize(m.into())),
 
-                (Initialized(bttn), s, dl) => Initialized(bttn.determine_state(s, dl)),
-                (i @ InProgress(_), _, _) => i,
-            }
+            // Into Playable
+            (UnInitialized(m), Some(s), true, false) => Initialized(Playable(m.into_playable(&s))),
+            (UnInitialized(m), None, true, false) => Initialized(PlayableWithoutSize(m.into())),
+
+            (Initialized(bttn), s, dl, false) => Initialized(bttn.determine_state(s, dl)),
+            (Initialized(bttn), _, _, true) => InProgress(bttn.into_progress()),
+            (i @ InProgress(_), _, _, _) => i,
         }
     }
 }