diff --git a/reference/ColumnList/ColumnList.upp b/reference/ColumnList/ColumnList.upp
new file mode 100644
index 000000000..08368ad2a
--- /dev/null
+++ b/reference/ColumnList/ColumnList.upp
@@ -0,0 +1,11 @@
+description "ColumnList examples, shows all 3 modes of ColumnList\377";
+
+uses
+	CtrlLib;
+
+file
+	main.cpp;
+
+mainconfig
+	"" = "GUI";
+
diff --git a/reference/ColumnList/main.cpp b/reference/ColumnList/main.cpp
new file mode 100644
index 000000000..147e0e240
--- /dev/null
+++ b/reference/ColumnList/main.cpp
@@ -0,0 +1,76 @@
+#include <CtrlLib/CtrlLib.h>
+
+using namespace Upp;
+
+struct TestWindow : public TopWindow {
+	struct TestDisplay : public Display {
+		virtual void Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style)	const;
+	};
+
+	ColumnList 		list[3];
+	Label			label[3];
+	TestDisplay 	display;
+	
+	TestWindow();
+	virtual void Layout();
+};
+
+void TestWindow::TestDisplay::Paint(Draw& w, const Rect& r, const Value& q, Color ink, Color paper, dword style) const
+{
+	PaintBackground(w, r, q, ink, paper, style);
+	String 	s = q;
+	int tcy = GetTextSize(s, StdFont()).cy;
+	int c = r.Deflated(1).GetSize().cy;
+	w.DrawImage(r.left+1, r.top+1, c, c, CtrlImg::File());
+	w.DrawText(r.left + c + 3, r.top+(r.GetHeight() - tcy) / 2, s, StdFont(), ink);
+}
+
+TestWindow::TestWindow()
+{
+	Title("ColumnList Example").Sizeable();
+	
+	list[0].ColumnMode().Columns(3).ItemHeight(max(16, list[0].GetItemHeight()));
+	list[1].RowMode().ItemWidth(80).ItemHeight(max(34, list[1].GetItemHeight()));
+	list[2].ListMode().Columns(3).ItemHeight(max(16, list[2].GetItemHeight()));
+	
+	for (int i = 0; i < 3; i++)
+		list[i].SetDisplay(display);
+	
+	for (int i = 0; i < 500; i++) {
+		String s = Format("Item %d", i+1);
+		for (int j = 0; j < 3; j++)
+			list[j].Add(i, s, true);
+	}
+
+	label[0].SetLabel("Column Mode (Default):");
+	label[1].SetLabel("Row Mode:");
+	label[2].SetLabel("List Mode:");
+	
+	*this << list[0] << list[1] << list[2];
+	*this << label[0] << label[1] << label[2];
+}
+
+void TestWindow::Layout()
+{
+	Size sz  = GetSize();
+	Size lsz = label[0].GetStdSize();
+	int w = (sz.cx - 8) / 3;
+	Rect r(2, 0, 2+w, lsz.cy);
+	for (int i = 0; i < 3; i++) {
+		label[i].SetRect(r);
+		r.OffsetHorz(w+2);
+	}
+	r = Rect(2, lsz.cy, 2+w, sz.cy-2);
+	for (int i = 0; i < 3; i++) {
+		list[i].SetRect(r);
+		r.OffsetHorz(w+2);
+	}	
+}
+
+GUI_APP_MAIN
+{
+	TestWindow wnd;
+	wnd.SetRect(Size(800, 320));
+	wnd.Run();
+}
+