diff --git a/src/barchart/barpresenterbase.h b/src/barchart/barpresenterbase.h
index cb1d902..8e47d8f 100644
--- a/src/barchart/barpresenterbase.h
+++ b/src/barchart/barpresenterbase.h
@@ -15,6 +15,7 @@ class Separator;
 class BarValue;
 
 // Common implemantation of different presenters. Not to be instantiated.
+// TODO: combine this with BarPresenter and derive others from it?
 class BarPresenterBase : public QObject, public ChartItem
 {
     Q_OBJECT
diff --git a/src/barchart/qbarchartseries.h b/src/barchart/qbarchartseries.h
index eb9c28f..b6101b7 100644
--- a/src/barchart/qbarchartseries.h
+++ b/src/barchart/qbarchartseries.h
@@ -12,7 +12,6 @@ class QBarSet;
 class BarChartModel;
 
 // Container for series
-// TODO: derive Stacked and percent bar charts from this?
 class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
 {
     Q_OBJECT
@@ -52,7 +51,7 @@ signals:
 
 //public Q_SLOTS:
 
-private:
+protected:
     BarChartModel* mModel;
 
 };
diff --git a/src/barchart/qpercentbarchartseries.cpp b/src/barchart/qpercentbarchartseries.cpp
index 7361a49..c521bc9 100644
--- a/src/barchart/qpercentbarchartseries.cpp
+++ b/src/barchart/qpercentbarchartseries.cpp
@@ -8,11 +8,11 @@
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 QPercentBarChartSeries::QPercentBarChartSeries(QBarCategory *category, QObject *parent)
-    : QChartSeries(parent)
-    ,mModel(new BarChartModel(category, this))
+    : QBarChartSeries(category, parent)
+//    ,mModel(new BarChartModel(category, this))
 {
 }
-
+/*
 void QPercentBarChartSeries::addBarSet(QBarSet *set)
 {
     connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
@@ -71,7 +71,7 @@ BarChartModel& QPercentBarChartSeries::model()
 {
     return *mModel;
 }
-
+*/
 
 #include "moc_qpercentbarchartseries.cpp"
 
diff --git a/src/barchart/qpercentbarchartseries.h b/src/barchart/qpercentbarchartseries.h
index 69f750a..7eaff04 100644
--- a/src/barchart/qpercentbarchartseries.h
+++ b/src/barchart/qpercentbarchartseries.h
@@ -3,7 +3,7 @@
 
 #include <QList>
 #include <QAbstractItemModel>
-#include "qchartseries.h"
+#include "qbarchartseries.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -11,7 +11,8 @@ class QBarCategory;
 class QBarSet;
 class BarChartModel;
 
-class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QChartSeries
+//class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QBarChartSeries
 {
     Q_OBJECT
 public:
@@ -19,7 +20,7 @@ public:
 
     // from BarChartSeriesBase
     virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
-
+/*
     void addBarSet(QBarSet *set);       // Takes ownership
     void removeBarSet(QBarSet *set);    // Releases ownership, doesn't delete set
     int countSets();
@@ -49,7 +50,7 @@ public Q_SLOTS:
 
 private:
     BarChartModel* mModel;
-
+*/
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/barchart/qstackedbarchartseries.cpp b/src/barchart/qstackedbarchartseries.cpp
index ecab997..d01b983 100644
--- a/src/barchart/qstackedbarchartseries.cpp
+++ b/src/barchart/qstackedbarchartseries.cpp
@@ -8,11 +8,11 @@
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
 QStackedBarChartSeries::QStackedBarChartSeries(QBarCategory *category, QObject *parent)
-    : QChartSeries(parent)
-    ,mModel(new BarChartModel(category, this))
+    : QBarChartSeries(category, parent)
+//    ,mModel(new BarChartModel(category, this))
 {
 }
-
+/*
 void QStackedBarChartSeries::addBarSet(QBarSet *set)
 {
     connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
@@ -71,7 +71,7 @@ BarChartModel& QStackedBarChartSeries::model()
 {
     return *mModel;
 }
-
+*/
 
 #include "moc_qstackedbarchartseries.cpp"
 
diff --git a/src/barchart/qstackedbarchartseries.h b/src/barchart/qstackedbarchartseries.h
index d73a258..9ef680d 100644
--- a/src/barchart/qstackedbarchartseries.h
+++ b/src/barchart/qstackedbarchartseries.h
@@ -3,7 +3,7 @@
 
 #include <QList>
 #include <QAbstractItemModel>
-#include "qchartseries.h"
+#include "qbarchartseries.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -11,7 +11,8 @@ class QBarCategory;
 class QBarSet;
 class BarChartModel;
 
-class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
+//class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
+class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QBarChartSeries
 {
     Q_OBJECT
 public:
@@ -19,7 +20,7 @@ public:
 
     // from QChartSeries
     virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
-
+/*
     // Set handling
     void addBarSet(QBarSet *set);       // Takes ownership
     void removeBarSet(QBarSet *set);    // Releases ownership, doesn't delete set
@@ -49,6 +50,7 @@ public Q_SLOTS:
 
 private:
     BarChartModel* mModel;
+*/
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE