diff --git a/Makefile b/Makefile
index 6e6a7bc..f8ecbd8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-source = parse.cpp parserstate.cpp parser.cpp templates.cpp
-objects = parserstate.o parser.o templates.o
+source = parse.cpp parserstate.cpp parser.cpp templates.cpp terminal.cpp
+objects = parserstate.o parser.o templates.o terminal.o
 executables = parse
 
 CXX = g++
diff --git a/parser.cpp b/parser.cpp
index b4e3811..f2e62f0 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -43,6 +43,8 @@ Parser::UTF8Parser::UTF8Parser()
     fprintf( stderr, "rtm requires a UTF-8 locale.\n" );
     throw std::string( "rtm requires a UTF-8 locale." );
   }
+
+  assert( BUF_SIZE >= MB_CUR_MAX );
 }
 
 std::vector<Parser::Action *> Parser::UTF8Parser::input( char c )
diff --git a/terminal.cpp b/terminal.cpp
new file mode 100644
index 0000000..9c17ba7
--- /dev/null
+++ b/terminal.cpp
@@ -0,0 +1 @@
+#include "terminal.hpp"
diff --git a/terminal.hpp b/terminal.hpp
new file mode 100644
index 0000000..65ac424
--- /dev/null
+++ b/terminal.hpp
@@ -0,0 +1,28 @@
+#ifndef TERMINAL_CPP
+#define TERMINAL_CPP
+
+#include <wchar.h>
+#include "parser.hpp"
+
+namespace Terminal {
+  class Terminal {
+  private:
+    Parser::UTF8Parser parser;
+
+    wchar_t *framebuffer;
+    size_t width, height;
+
+    size_t cursor_col, cursor_row;
+
+  public:
+    Terminal();
+    ~Terminal();
+
+    
+    
+    Terminal( const Terminal & );
+    Terminal &operator=( const Terminal & );
+  };
+}
+
+#endif