diff --git a/src/core/Buffer.cc b/src/core/Buffer.cc
new file mode 100644
index 0000000..97618ba
--- /dev/null
+++ b/src/core/Buffer.cc
@@ -0,0 +1,19 @@
+#include "Buffer.h"
+#include "FileLoader.h"
+
+bool Buffer::load_from_file(const char * filename)
+{
+    FileLoader fl;
+
+    if (!fl.load(filename))
+    {
+        return false;
+    }
+
+    for (size_t i = 0, num_lines = fl.num_lines(); i < num_lines; i++)
+    {
+        m_lines.push_back(fl.get_line(i));
+    }
+
+    return true;
+}
diff --git a/src/core/Buffer.h b/src/core/Buffer.h
new file mode 100644
index 0000000..39d4ac3
--- /dev/null
+++ b/src/core/Buffer.h
@@ -0,0 +1,17 @@
+#ifndef BUFFER_H
+#define BUFFER_H
+
+#include <list>
+#include <memory>
+#include "Text.h"
+
+class Buffer
+{
+public:
+    bool load_from_file(const char * filename);
+
+protected:
+    std::list<std::shared_ptr<Text>> m_lines;
+};
+
+#endif