diff --git a/hammond-gtk/resources/gtk/headerbar.ui b/hammond-gtk/resources/gtk/headerbar.ui
index e84409d..d28c2ae 100644
--- a/hammond-gtk/resources/gtk/headerbar.ui
+++ b/hammond-gtk/resources/gtk/headerbar.ui
@@ -3,7 +3,6 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkPopover" id="add-popover">
-    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="tooltip_text" translatable="yes">Add a new feed</property>
     <property name="valign">center</property>
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index ac6c736..2ebb4cc 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -7,6 +7,68 @@ use hammond_data::utils::url_cleaner;
 use podcasts_view::update_podcasts_view;
 use utils;
 
+#[derive(Debug)]
+pub struct Header {
+    container: gtk::HeaderBar,
+    home: gtk::Button,
+    refresh: gtk::Button,
+    add_toggle: gtk::MenuButton,
+}
+
+impl Header {
+    fn new() -> Header {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
+
+        let header: gtk::HeaderBar = builder.get_object("headerbar1").unwrap();
+        let home: gtk::Button = builder.get_object("homebutton").unwrap();
+        let refresh: gtk::Button = builder.get_object("refbutton").unwrap();
+        let add_toggle: gtk::MenuButton = builder.get_object("add-toggle-button").unwrap();
+
+        Header {
+            container: header,
+            home,
+            refresh,
+            add_toggle,
+        }
+    }
+
+    fn init(&self, stack: &gtk::Stack) {
+        let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
+
+        let add_popover: gtk::Popover = builder.get_object("add-popover").unwrap();
+        let new_url: gtk::Entry = builder.get_object("new-url").unwrap();
+        let add_button: gtk::Button = builder.get_object("add-button").unwrap();
+
+        new_url.connect_changed(move |url| {
+            println!("{:?}", url.get_text());
+        });
+
+        add_button.connect_clicked(clone!(stack, add_popover, new_url => move |_| {
+            on_add_bttn_clicked(&stack, &new_url);
+
+            // TODO: lock the button instead of hiding and add notification of feed added.
+            // TODO: map the spinner
+            add_popover.hide();
+        }));
+        self.add_toggle.set_popover(&add_popover);
+
+        // TODO: make it a back arrow button, that will hide when appropriate,
+        // and add a StackSwitcher when more views are added.
+        self.home.connect_clicked(clone!(stack => move |_| {
+            let vis = stack.get_visible_child_name().unwrap();
+            stack.set_visible_child_name("fb_parent");
+            if vis != "pdw" {
+                update_podcasts_view(&stack);
+            }
+        }));
+
+        // FIXME: There appears to be a memmory leak here.
+        self.refresh.connect_clicked(clone!(stack => move |_| {
+            utils::refresh_feed(&stack, None, None);
+        }));
+    }
+}
+
 pub fn get_headerbar(stack: &gtk::Stack) -> gtk::HeaderBar {
     let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/headerbar.ui");
 
@@ -23,16 +85,13 @@ pub fn get_headerbar(stack: &gtk::Stack) -> gtk::HeaderBar {
         println!("{:?}", url.get_text());
     });
 
-    add_button.connect_clicked(clone!(stack, add_popover => move |_| {
-        let url = new_url.get_text().unwrap_or_default();
-        let url = url_cleaner(&url);
-        on_add_bttn_clicked(&stack, &url);
+    add_button.connect_clicked(clone!(stack, add_popover, new_url => move |_| {
+        on_add_bttn_clicked(&stack, &new_url);
 
         // TODO: lock the button instead of hiding and add notification of feed added.
         // TODO: map the spinner
         add_popover.hide();
     }));
-    add_popover.hide();
     add_toggle_button.set_popover(&add_popover);
 
     // TODO: make it a back arrow button, that will hide when appropriate,
@@ -53,8 +112,10 @@ pub fn get_headerbar(stack: &gtk::Stack) -> gtk::HeaderBar {
     header
 }
 
-fn on_add_bttn_clicked(stack: &gtk::Stack, url: &str) {
-    let source = Source::from_url(url);
+fn on_add_bttn_clicked(stack: &gtk::Stack, entry: &gtk::Entry) {
+    let url = entry.get_text().unwrap_or_default();
+    let url = url_cleaner(&url);
+    let source = Source::from_url(&url);
 
     if let Ok(s) = source {
         info!("{:?} feed added", url);