diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index bf4ded2d..1ea0e9dd 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -1917,6 +1917,9 @@ void gGraphView::ResetBounds(bool refresh) //short group)
     }
     if (!g) g=m_graphs[0];
 
+    m_minx=g->min_x;
+    m_maxx=g->max_x;
+
     qint64 xx=g->max_x - g->min_x;
     double d=xx/86400000L;
     int h=xx/3600000L;
@@ -1934,6 +1937,11 @@ void gGraphView::ResetBounds(bool refresh) //short group)
     }
     updateScale();
 }
+void gGraphView::GetXBounds(qint64 & st,qint64 & et)
+{
+    st=m_minx;
+    et=m_maxx;
+}
 
 void gGraphView::SetXBounds(qint64 minx, qint64 maxx,short group,bool refresh)
 {
@@ -1942,6 +1950,9 @@ void gGraphView::SetXBounds(qint64 minx, qint64 maxx,short group,bool refresh)
             m_graphs[i]->SetXBounds(minx,maxx);
         }
     }
+    m_minx=minx;
+    m_maxx=maxx;
+
     qint64 xx=maxx-minx;
     double d=xx/86400000L;
     int h=xx/3600000L;
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index 346807a2..a554cd97 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -402,6 +402,7 @@ public:
 
     float scaleY() { return m_scaleY; }
 
+    void GetXBounds(qint64 & st,qint64 & et);
     void ResetBounds(bool refresh=true); //short group=0);
     void SetXBounds(qint64 minx, qint64 maxx, short group=0,bool refresh=true);
     void SaveSettings(QString title);
@@ -504,6 +505,8 @@ protected:
 
     QString m_emptytext;
     bool m_showsplitter;
+
+    qint64 m_minx,m_maxx;
 signals:
 
 
diff --git a/SleepLib/calcs.cpp b/SleepLib/calcs.cpp
index d98b0697..76d3bc4e 100644
--- a/SleepLib/calcs.cpp
+++ b/SleepLib/calcs.cpp
@@ -7,51 +7,9 @@
 #include "calcs.h"
 #include "profiles.h"
 
-Calculation::Calculation(ChannelID id,QString name)
-    :m_id(id),m_name(name)
-{
-}
 
-Calculation::~Calculation()
-{
-}
-
-CalcRespRate::CalcRespRate(ChannelID id)
-    :Calculation(id,"Resp. Rate")
-{
-}
-
-// Generate RespiratoryRate graph
-int CalcRespRate::calculate(Session *session)
-{
-    if (session->machine()->GetType()!=MT_CPAP) return 0;
-    if (session->eventlist.contains(CPAP_RespRate)) return 0; // already exists?
-
-    if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform
-
-    EventList *flow, *rr,  *tv=NULL, *mv=NULL;
-    if (!session->eventlist.contains(CPAP_TidalVolume)) {
-        tv=new EventList(EVL_Event);
-        session->eventlist[CPAP_TidalVolume].push_back(tv);
-    }
-    if (!session->eventlist.contains(CPAP_MinuteVent)) {
-        mv=new EventList(EVL_Event);
-        session->eventlist[CPAP_MinuteVent].push_back(mv);
-    }
-    int cnt=0;
-    for (int ws=0; ws < session->eventlist[CPAP_FlowRate].size(); ws++) {
-        flow=session->eventlist[CPAP_FlowRate][ws];
-        if (flow->count() > 5) {
-            rr=new EventList(EVL_Event);
-            session->eventlist[CPAP_RespRate].push_back(rr);
-
-            cnt+=filterFlow(flow,rr,tv,mv,flow->rate());
-        }
-    }
-    return cnt;
-}
-
-int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, double rate)
+// Support function for calcRespRate()
+int filterFlow(EventList *in, EventList *out, EventList *tv, EventList *mv, double rate)
 {
 
     int size=in->count();
@@ -273,6 +231,37 @@ int CalcRespRate::filterFlow(EventList *in, EventList *out, EventList *tv, Event
     return out->count();
 }
 
+// Generate RespiratoryRate graph
+int calcRespRate(Session *session)
+{
+    if (session->machine()->GetType()!=MT_CPAP) return 0;
+    if (session->eventlist.contains(CPAP_RespRate)) return 0; // already exists?
+
+    if (!session->eventlist.contains(CPAP_FlowRate)) return 0; //need flow waveform
+
+    EventList *flow, *rr,  *tv=NULL, *mv=NULL;
+    if (!session->eventlist.contains(CPAP_TidalVolume)) {
+        tv=new EventList(EVL_Event);
+        session->eventlist[CPAP_TidalVolume].push_back(tv);
+    }
+    if (!session->eventlist.contains(CPAP_MinuteVent)) {
+        mv=new EventList(EVL_Event);
+        session->eventlist[CPAP_MinuteVent].push_back(mv);
+    }
+    int cnt=0;
+    for (int ws=0; ws < session->eventlist[CPAP_FlowRate].size(); ws++) {
+        flow=session->eventlist[CPAP_FlowRate][ws];
+        if (flow->count() > 5) {
+            rr=new EventList(EVL_Event);
+            session->eventlist[CPAP_RespRate].push_back(rr);
+
+            cnt+=filterFlow(flow,rr,tv,mv,flow->rate());
+        }
+    }
+    return cnt;
+}
+
+
 EventDataType calcAHI(Session *session,qint64 start, qint64 end)
 {
     double hours,ahi,cnt;
@@ -297,12 +286,7 @@ EventDataType calcAHI(Session *session,qint64 start, qint64 end)
     return ahi;
 }
 
-CalcAHIGraph::CalcAHIGraph(ChannelID id):
-    Calculation(id,"AHI/hour")
-{
-}
-
-int CalcAHIGraph::calculate(Session *session)
+int calcAHIGraph(Session *session)
 {
     if (session->machine()->GetType()!=MT_CPAP) return 0;
     if (session->eventlist.contains(CPAP_AHI)) return 0; // abort if already there
diff --git a/SleepLib/calcs.h b/SleepLib/calcs.h
index 9838e9e0..96d471b3 100644
--- a/SleepLib/calcs.h
+++ b/SleepLib/calcs.h
@@ -8,39 +8,14 @@
 
 #include "day.h"
 
-class Calculation
-{
-public:
-    Calculation(ChannelID id,QString name);
-    virtual ~Calculation();
-    virtual int calculate(Session *session)=0;
-protected:
-    ChannelID m_id;
-    QString m_name;
-};
-
-class CalcRespRate:public Calculation
-{
-public:
-    CalcRespRate(ChannelID id=CPAP_RespRate);
-    virtual int calculate(Session *session);
-protected:
-    int filterFlow(EventList *in, EventList *out,EventList *tv, EventList *mv, double rate);
-};
-
-class CalcAHIGraph:public Calculation
-{
-public:
-    CalcAHIGraph(ChannelID id=CPAP_AHI);
-    virtual int calculate(Session *session);
-protected:
-};
+int calcRespRate(Session *session);
+int calcAHIGraph(Session *session);
+EventDataType calcAHI(Session *session,qint64 start=0, qint64 end=0);
 
 int calcLeaks(Session *session);
 
 int calcPulseChange(Session *session);
 int calcSPO2Drop(Session *session);
 
-EventDataType calcAHI(Session *session,qint64 start=0, qint64 end=0);
 
 #endif // CALCS_H
diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp
index 8c03b5a2..a5a8571d 100644
--- a/SleepLib/session.cpp
+++ b/SleepLib/session.cpp
@@ -452,12 +452,8 @@ bool Session::LoadEvents(QString filename)
 
 void Session::UpdateSummaries()
 {
-    CalcAHIGraph ahi;
-    CalcRespRate calc;
-
-    ahi.calculate(this);
-    calc.calculate(this);
-
+    calcAHIGraph(this);
+    calcRespRate(this);
     calcLeaks(this);
 
     calcSPO2Drop(this);
diff --git a/daily.cpp b/daily.cpp
index 536120a7..d7b39252 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -43,7 +43,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     ui->setupUi(this);
 
     // Remove Incomplete Extras Tab
-    ui->tabWidget->removeTab(3);
+    //ui->tabWidget->removeTab(3);
 
     QList<int> a;
     a.push_back(300);
@@ -73,6 +73,11 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     scrollbar->setSizePolicy(QSizePolicy::Maximum,QSizePolicy::Expanding);
     scrollbar->setMaximumWidth(20);
 
+    ui->bookmarkTable->setColumnCount(2);
+    ui->bookmarkTable->setColumnWidth(0,70);
+    //ui->bookmarkTable->setEditTriggers(QAbstractItemView::SelectedClicked);
+    //ui->bookmarkTable->setColumnHidden(2,true);
+    //ui->bookmarkTable->setColumnHidden(3,true);
     GraphView->setScrollBar(scrollbar);
     layout->addWidget(GraphView,1);
     layout->addWidget(scrollbar,0);
@@ -461,9 +466,11 @@ void Daily::LoadDate(QDate date)
 
 void Daily::on_calendar_selectionChanged()
 {
+
     if (previous_date.isValid())
         Unload(previous_date);
 
+    ZombieMeterMoved=false;
     Load(ui->calendar->selectedDate());
     ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
     ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
@@ -787,30 +794,121 @@ void Daily::Load(QDate date)
     ui->webView->setHtml(html);
 
     ui->JournalNotes->clear();
+
+    ui->bookmarkTable->clear();
+    ui->bookmarkTable->setRowCount(0);
+    QStringList sl;
+    sl.append("Starts");
+    sl.append("Notes");
+    ui->bookmarkTable->setHorizontalHeaderLabels(sl);
+    ui->weightSpinBox->setValue(0);
+    ui->ZombieMeter->setValue(50);
     Session *journal=GetJournalSession(date);
     if (journal) {
-        ui->JournalNotes->setHtml(journal->settings[Journal_Notes].toString());
+        bool ok;
+        if (journal->settings.contains(Journal_Notes))
+            ui->JournalNotes->setHtml(journal->settings[Journal_Notes].toString());
+
+        if (journal->settings.contains("Weight"))
+            ui->weightSpinBox->setValue(journal->settings["Weight"].toDouble(&ok));
+
+        if (journal->settings.contains("ZombieMeter"))
+            ui->ZombieMeter->setValue(journal->settings["ZombieMeter"].toDouble(&ok));
+
+        if (journal->settings.contains("BookmarkStart")) {
+            QVariantList start=journal->settings["BookmarkStart"].toList();
+            QVariantList end=journal->settings["BookmarkEnd"].toList();
+            QStringList notes=journal->settings["BookmarkNotes"].toStringList();
+
+            bool ok;
+            for (int i=0;i<start.size();i++) {
+                qint64 st=start.at(i).toLongLong(&ok);
+                qint64 et=end.at(i).toLongLong(&ok);
+
+                QDateTime d=QDateTime::fromTime_t(st/1000L);
+                //int row=ui->bookmarkTable->rowCount();
+                ui->bookmarkTable->insertRow(i);
+                QTableWidgetItem *tw=new QTableWidgetItem(notes.at(i));
+                QTableWidgetItem *dw=new QTableWidgetItem(d.time().toString("HH:mm:ss"));
+                dw->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+                ui->bookmarkTable->setItem(i,0,dw);
+                ui->bookmarkTable->setItem(i,1,tw);
+                tw->setData(Qt::UserRole,st);
+                tw->setData(Qt::UserRole+1,et);
+            }
+        }
     }
 
 }
 void Daily::Unload(QDate date)
 {
     Session *journal=GetJournalSession(date);
-    if (!ui->JournalNotes->toPlainText().isEmpty()) {
-        QString jhtml=ui->JournalNotes->toHtml();
-        if (journal) {
-            if (journal->settings[Journal_Notes]!=jhtml) {
-                journal->settings[Journal_Notes]=jhtml;
-                journal->SetChanged(true);
-            }
 
-        } else {
-            journal=CreateJournalSession(date);
+    bool nonotes=ui->JournalNotes->toPlainText().isEmpty();
+    bool ok;
+    if (journal) {
+        QString jhtml=ui->JournalNotes->toHtml();
+        if ((!journal->settings.contains(Journal_Notes) && !nonotes) || (!nonotes && (journal->settings[Journal_Notes]!=jhtml))) {
             journal->settings[Journal_Notes]=jhtml;
             journal->SetChanged(true);
         }
-
+        if ((!journal->settings.contains("Weight") && (ui->weightSpinBox->value()>0)) || (journal->settings["Weight"].toDouble(&ok)!=ui->weightSpinBox->value())) {
+            journal->settings["Weight"]=ui->weightSpinBox->value();
+            journal->SetChanged(true);
+        }
+        if ((!journal->settings.contains("ZombieMeter") && (ui->ZombieMeter->value()!=50)) || (journal->settings["ZombieMeter"].toDouble(&ok)!=ui->ZombieMeter->value())) {
+            journal->settings["ZombieMeter"]=ui->ZombieMeter->value();
+            journal->SetChanged(true);
+        }
+        bool ok;
+        if (ui->bookmarkTable->rowCount()>0) {
+            QVariantList start;
+            QVariantList end;
+            QStringList notes;
+            QTableWidgetItem *item;
+            for (int row=0;row<ui->bookmarkTable->rowCount();row++) {
+                item=ui->bookmarkTable->item(row,1);
+                start.push_back(item->data(Qt::UserRole));
+                end.push_back(item->data(Qt::UserRole+1));
+                notes.push_back(item->text());
+            }
+            journal->settings["BookmarkStart"]=start;
+            journal->settings["BookmarkEnd"]=end;
+            journal->settings["BookmarkNotes"]=notes;
+        }
+    } else {
+        if (!nonotes || ZombieMeterMoved || (ui->weightSpinBox->value() > 0) || (ui->bookmarkTable->rowCount()>0)) {
+            journal=CreateJournalSession(date);
+            if (!nonotes) {
+                journal->settings[Journal_Notes]=ui->JournalNotes->toHtml();
+                journal->SetChanged(true);
+            }
+            if (ZombieMeterMoved) {
+                journal->settings["ZombieMeter"]=ui->ZombieMeter->value();
+                journal->SetChanged(true);
+            }
+            if (ui->weightSpinBox->value() > 0) {
+                journal->settings["Weight"]=ui->weightSpinBox->value();
+                journal->SetChanged(true);
+            }
+            if (ui->bookmarkTable->rowCount()>0) {
+                QVariantList start;
+                QVariantList end;
+                QStringList notes;
+                QTableWidgetItem *item;
+                for (int row=0;row<ui->bookmarkTable->rowCount();row++) {
+                    item=ui->bookmarkTable->item(row,1);
+                    start.push_back(item->data(Qt::UserRole));
+                    end.push_back(item->data(Qt::UserRole+1));
+                    notes.push_back(item->text());
+                }
+                journal->settings["BookmarkStart"]=start;
+                journal->settings["BookmarkEnd"]=end;
+                journal->settings["BookmarkNotes"]=notes;
+            }
+        }
     }
+
     if (journal) {
         Machine *jm=PROFILE.GetMachine(MT_JOURNAL);
         if (jm) jm->SaveSession(journal);
@@ -925,16 +1023,6 @@ Session * Daily::GetJournalSession(QDate date) // Get the first journal session
         return *s;
     return NULL;
 }
-void Daily::on_EnergySlider_sliderMoved(int position)
-{
-    position=position;
-    //Session *s=GetJournalSession(previous_date);
-    //if (!s)
-      //  s=CreateJournalSession(previous_date);
-
-    //s->summary[JOURNAL_Energy]=position;
-    //s->SetChanged(true);
-}
 
 void Daily::UpdateCPAPGraphs(Day *day)
 {
@@ -1113,3 +1201,63 @@ void Daily::on_evViewSlider_valueChanged(int value)
     }
 }
 
+void Daily::on_bookmarkTable_itemClicked(QTableWidgetItem *item)
+{
+    int row=item->row();
+    qint64 st,et;
+
+    QTableWidgetItem *it=ui->bookmarkTable->item(row,1);
+    bool ok;
+    st=it->data(Qt::UserRole).toLongLong(&ok);
+    et=it->data(Qt::UserRole+1).toLongLong(&ok);
+    GraphView->SetXBounds(st,et);
+    GraphView->updateGL();
+}
+
+void Daily::on_bookmarkTable_itemActivated(QTableWidgetItem *item)
+{
+}
+
+void Daily::on_addBookmarkButton_clicked()
+{
+    qint64 st,et;
+    GraphView->GetXBounds(st,et);
+    QDateTime d=QDateTime::fromTime_t(st/1000L);
+    int row=ui->bookmarkTable->rowCount();
+    ui->bookmarkTable->insertRow(row);
+    QTableWidgetItem *tw=new QTableWidgetItem("Bookmark at "+d.time().toString("HH:mm:ss"));
+    QTableWidgetItem *dw=new QTableWidgetItem(d.time().toString("HH:mm:ss"));
+    dw->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+    ui->bookmarkTable->setItem(row,0,dw);
+    ui->bookmarkTable->setItem(row,1,tw);
+    tw->setData(Qt::UserRole,st);
+    tw->setData(Qt::UserRole+1,et);
+
+    //ui->bookmarkTable->setItem(row,2,new QTableWidgetItem(QString::number(st)));
+    //ui->bookmarkTable->setItem(row,3,new QTableWidgetItem(QString::number(et)));
+}
+
+void Daily::on_removeBookmarkButton_clicked()
+{
+    int row=ui->bookmarkTable->currentRow();
+    if (row>=0) {
+        ui->bookmarkTable->removeRow(row);
+    }
+}
+
+void Daily::on_ZombieMeter_actionTriggered(int action)
+{
+    ZombieMeterMoved=true;
+    qDebug() << "ZombieMeter" << action;
+}
+
+//void Daily::on_EnergySlider_sliderMoved(int position)
+//{
+  //  position=position;
+    //Session *s=GetJournalSession(previous_date);
+    //if (!s)
+      //  s=CreateJournalSession(previous_date);
+
+    //s->summary[JOURNAL_Energy]=position;
+    //s->SetChanged(true);
+//}
diff --git a/daily.h b/daily.h
index 9ac61679..2d176415 100644
--- a/daily.h
+++ b/daily.h
@@ -17,6 +17,7 @@
 #include <QLabel>
 #include <QtOpenGL/QGLContext>
 #include <QScrollBar>
+#include <QTableWidgetItem>
 #include "Graphs/gSummaryChart.h"
 
 #include <SleepLib/profiles.h>
@@ -55,7 +56,6 @@ private slots:
     void on_JournalNotesBold_clicked();
     void on_JournalNotesFontsize_activated(int index);
     void on_JournalNotesColour_clicked();
-    void on_EnergySlider_sliderMoved(int position);
 
     void on_treeWidget_itemSelectionChanged();
 
@@ -75,6 +75,16 @@ private slots:
     void on_treeWidget_itemClicked(QTreeWidgetItem *item, int column);
 
     void on_graphtogglebutton_toggled(bool);
+    void on_ZombieMeter_actionTriggered(int action);
+
+    void on_addBookmarkButton_clicked();
+
+    void on_removeBookmarkButton_clicked();
+
+    void on_bookmarkTable_itemActivated(QTableWidgetItem *item);
+
+    void on_bookmarkTable_itemClicked(QTableWidgetItem *item);
+
 protected:
 
 private:
@@ -110,6 +120,10 @@ private:
     gGraphView *GraphView,*snapGV;
     MyScrollBar *scrollbar;
     QHBoxLayout *layout;
+    bool ZombieMeterMoved;
 };
 
 #endif // DAILY_H
+
+
+
diff --git a/daily.ui b/daily.ui
index 43fb69fc..4a63c028 100644
--- a/daily.ui
+++ b/daily.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>671</width>
-    <height>433</height>
+    <width>687</width>
+    <height>484</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -248,7 +248,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>3</number>
        </property>
        <property name="movable">
         <bool>true</bool>
@@ -489,182 +489,176 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QWidget" name="widget" native="true">
+           <layout class="QFormLayout" name="formLayout">
+            <property name="horizontalSpacing">
+             <number>4</number>
+            </property>
+            <property name="verticalSpacing">
+             <number>4</number>
+            </property>
+            <property name="leftMargin">
+             <number>2</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>2</number>
+            </property>
+            <property name="bottomMargin">
+             <number>2</number>
+            </property>
+            <item row="2" column="0" colspan="2">
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0">
+               <widget class="QLabel" name="label">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="font">
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
+                <property name="text">
+                 <string>Zombie</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0" colspan="3">
+               <widget class="QSlider" name="ZombieMeter">
+                <property name="value">
+                 <number>50</number>
+                </property>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="tickPosition">
+                 <enum>QSlider::TicksAbove</enum>
+                </property>
+                <property name="tickInterval">
+                 <number>5</number>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="2">
+               <widget class="QLabel" name="label_10">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="font">
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
+                <property name="text">
+                 <string>Awesome</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <widget class="QLabel" name="label_9">
+                <property name="font">
+                 <font>
+                  <weight>50</weight>
+                  <bold>false</bold>
+                 </font>
+                </property>
+                <property name="text">
+                 <string>I'm feeling...</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_8">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Weight</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <widget class="QDoubleSpinBox" name="weightSpinBox">
+              <property name="maximum">
+               <double>399.990000000000009</double>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
         </layout>
        </widget>
-       <widget class="QWidget" name="extras">
+       <widget class="QWidget" name="bookmarkTab">
         <attribute name="title">
-         <string>Extras</string>
+         <string>Bookmarks</string>
         </attribute>
-        <layout class="QVBoxLayout" name="verticalLayout_8">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
-          <widget class="QLabel" name="label_6">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Sunken</enum>
-           </property>
+          <widget class="QPushButton" name="addBookmarkButton">
            <property name="text">
-            <string>This tab is fake.. What to put here?</string>
-           </property>
-           <property name="scaledContents">
-            <bool>false</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
+            <string>Bookmark Selection</string>
            </property>
           </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <property name="spacing">
-            <number>2</number>
+          <widget class="QTableWidget" name="bookmarkTable">
+           <property name="alternatingRowColors">
+            <bool>true</bool>
            </property>
-           <item>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
-             <item>
-              <widget class="QLabel" name="label">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Energy Level</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSlider" name="EnergySlider">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksAbove</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QVBoxLayout" name="verticalLayout_5">
-             <item>
-              <widget class="QLabel" name="label_2">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Mood</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSlider" name="MoodSlider">
-               <property name="value">
-                <number>99</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="tickPosition">
-                <enum>QSlider::TicksAbove</enum>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
+           <property name="selectionMode">
+            <enum>QAbstractItemView::SingleSelection</enum>
+           </property>
+           <property name="selectionBehavior">
+            <enum>QAbstractItemView::SelectRows</enum>
+           </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+           <column>
+            <property name="text">
+             <string>Starts</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Notes</string>
+            </property>
+           </column>
+          </widget>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <property name="spacing">
-            <number>2</number>
+          <widget class="QPushButton" name="removeBookmarkButton">
+           <property name="text">
+            <string>Remove Bookmark</string>
            </property>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_6">
-               <property name="sizeConstraint">
-                <enum>QLayout::SetMinimumSize</enum>
-               </property>
-               <item>
-                <widget class="QLabel" name="label_3">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Weight</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QDoubleSpinBox" name="WeightBox">
-                 <property name="suffix">
-                  <string/>
-                 </property>
-                 <property name="maximum">
-                  <double>999.990000000000009</double>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_3">
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_7">
-               <property name="sizeConstraint">
-                <enum>QLayout::SetMinimumSize</enum>
-               </property>
-               <item>
-                <widget class="QLabel" name="label_4">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="text">
-                  <string>Glucose</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QDoubleSpinBox" name="GlucoseBox"/>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>77</height>
-            </size>
-           </property>
-          </spacer>
+          </widget>
          </item>
         </layout>
        </widget>