diff --git a/juci/CMakeLists.txt b/juci/CMakeLists.txt
index 3e4cf3b..8398b7c 100644
--- a/juci/CMakeLists.txt
+++ b/juci/CMakeLists.txt
@@ -64,9 +64,9 @@ endif()
 add_executable(${project_name}
 # list of every needed file to create the executable
     menu.h
-
     menu.cc
-
+    source.h
+    source.cc
     window.cc
     juci.cc
     )
diff --git a/juci/juci.cc b/juci/juci.cc
index 6b86603..4b6f121 100644
--- a/juci/juci.cc
+++ b/juci/juci.cc
@@ -1,9 +1,18 @@
 #include "juci.h"
-
 int main(int argc, char *argv[]) {
+  Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(
+								argc,
+								argv,
+								"no.sout.juci"
+								);
+  Window window;
+  return app->run(window);;
 
-    Glib::RefPtr<Gtk::Application> app = Gtk::Application::create(argc, argv, "no.sout.juci");
-    Window window;
+}
 
-    return app->run(window);;
+////////////////
+//// Window ////
+////////////////
+std::shared_ptr<Source::Controller> Window::source() {
+  return std::shared_ptr<Source::Controller>(&source_);
 }
diff --git a/juci/juci.h b/juci/juci.h
index 37dc1ef..91e7937 100644
--- a/juci/juci.h
+++ b/juci/juci.h
@@ -1,25 +1,23 @@
 /*juCi++ main header file*/
-#ifndef JUCI_H
-#define JUCI_H
+#ifndef JUCI_JUCI_H_
+#define JUCI_JUCI_H_
 
 #include <iostream>
 #include "gtkmm.h"
 #include "menu.h"
-
+#include "source.h"
 
 class Window : public Gtk::Window {
 public:
-    Window();
-
-    virtual ~Window();
-
-    Gtk::Box window_box_;
-
+  Window();
+  virtual ~Window(){};
+  Gtk::Box window_box_;
+  std::shared_ptr<Source::Controller> source();
 private:
-    Menu::Controller menu;
-    /*signal handler*/
-    void onSystemQuit();
-
+  Menu::Controller menu;
+  Source::Controller source_;
+  /*signal handler*/
+  void onSystemQuit();
 };
 
-#endif // JUCI_H
+#endif  // JUCI_JUCI_H_
diff --git a/juci/menu.cc b/juci/menu.cc
index bdd00f7..ac6d9ee 100644
--- a/juci/menu.cc
+++ b/juci/menu.cc
@@ -68,13 +68,14 @@ void Menu::View::set_ui_manger_string(std::string ui_string) {
     }
 }
 
-void Menu::View::set_ui_manager_action_group(Glib::RefPtr<Gtk::ActionGroup> action_group) {
+void Menu::View::set_ui_manager_action_group(Glib::RefPtr<Gtk::ActionGroup>
+                                             action_group) {
     ui_manager_->insert_action_group(action_group);
 }
 
-Gtk::Box &Menu::View::view() {
+Glib::RefPtr<Gtk::Box> Menu::View::view() {
     view_.pack_start(*ui_manager_->get_widget("/MenuBar"), Gtk::PACK_SHRINK);
-    return view_;
+    return Glib::RefPtr<Gtk::Box>(&view_);
 }
 
 
@@ -184,8 +185,8 @@ Menu::Controller::~Controller() {
 
 }
 
-Gtk::Box &Menu::Controller::view() {
-    return menu_view_.view();
+Glib::RefPtr<Gtk::Box> Menu::Controller::view() {
+  return menu_view_.view();
 }
 
 void Menu::Controller::onFileNewEmptyfile() {
@@ -204,7 +205,7 @@ void Menu::Controller::onFileNewHeaderFile() {
 void Menu::Controller::onSystemQuit(){
     //TODO(Oyvang, Zalox, Forgie) Add everything that needs to be done before quiting
     /*Quit the system*/
-    Gtk::Main::quit(); //TODO(Oyvang, Zalox, Forgie) methode is depricated, find a better solution.
+  
 }
 void Menu::Controller::onPluginAddSnippet() {
     std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code)
@@ -244,4 +245,4 @@ void Menu::Controller::onWindowSplitWindow() {
 void Menu::Controller::onHelpAbout() {
     std::cout << "Clicked about" << std::endl;
     //TODO(Oyvang) Legg til funksjon
-}
\ No newline at end of file
+}
diff --git a/juci/menu.h b/juci/menu.h
index e7d3437..1fe345e 100644
--- a/juci/menu.h
+++ b/juci/menu.h
@@ -1,90 +1,65 @@
+#ifndef JUCI_MENU_H_
+#define JUCI_MENU_H_
+
 #include <iostream>
 #include "gtkmm.h"
 namespace Menu {
-    class Model {
-    public:
-        Model();
-
-        virtual~Model();
-
-        std::string ui_string() {
-            return ui_string_;
-        };
-    private:
-        std::string ui_string_;
-    };
-
-
-    class View {
-    public:
-        View(Gtk::Orientation orient);
-
-        virtual ~View();
-
-        Gtk::Box &view();
-
-        Glib::RefPtr <Gtk::ActionGroup> action_group() {
-            return action_group_;
-        };
-
-        Glib::RefPtr <Gtk::UIManager> ui_manager() {
-            return ui_manager_;
-        };
-
-        void set_ui_manger_string(std::string ui_string);
-
-        void set_ui_manager_action_group(Glib::RefPtr <Gtk::ActionGroup> action_group);
-
-    protected:
-        Gtk::Box view_;
-        Glib::RefPtr <Gtk::UIManager> ui_manager_;
-        Glib::RefPtr <Gtk::ActionGroup> action_group_;
-    };
-
-    class Controller {
-    public:
-        Controller();
-
-        virtual ~Controller();
-
-        Gtk::Box &view();
-
-        Glib::RefPtr <Gtk::UIManager> ui_manager() {
-            return menu_view_.ui_manager();
-        };
-
-    private:
-        Menu::View menu_view_;
-        Menu::Model menu_model_;
-
-        /*Signal handlers*/
-        void onFileNewEmptyfile();
-
-        void onFileNewCCFile();
-
-        void onFileNewHeaderFile();
-
-        void onFileOpenFile();
-
-        void onFileOpenFolder();
-
-        void onSystemQuit();
-
-        void onPluginAddSnippet();
-
-        void onWindowCloseTab();
-
-        void onEditCopy();
-
-        void onEditCut();
-
-        void onEditPaste();
-
-        void onEditFind();
-
-        void onWindowSplitWindow();
-
-        void onHelpAbout();
-
-    };
-}
\ No newline at end of file
+  class Model {
+  public:
+    Model();
+    virtual~Model();
+    std::string ui_string() { return ui_string_; }
+  private:
+    std::string ui_string_;
+  };  // class Model
+
+  class View {
+  public:
+    explicit View(Gtk::Orientation orient);
+    virtual ~View();
+    Glib::RefPtr<Gtk::Box> view();
+    Glib::RefPtr <Gtk::ActionGroup> action_group() {
+      return action_group_;
+    }
+    Glib::RefPtr <Gtk::UIManager> ui_manager() {
+      return ui_manager_;
+    }
+    void set_ui_manger_string(std::string ui_string);
+    void set_ui_manager_action_group(
+                           Glib::RefPtr<Gtk::ActionGroup> action_group);
+
+  protected:
+    Gtk::Box view_;
+    Glib::RefPtr <Gtk::UIManager> ui_manager_;
+    Glib::RefPtr <Gtk::ActionGroup> action_group_;
+  };  // class View
+  // controller
+  class Controller {
+  public:
+    Controller();
+    virtual ~Controller();
+    Glib::RefPtr<Gtk::Box> view();
+    Glib::RefPtr <Gtk::UIManager> ui_manager() {
+      return menu_view_.ui_manager();
+    }
+
+  private:
+    View menu_view_;
+    Model menu_model_;
+    void onFileNewEmptyfile();    /*Signal handlers*/
+    void onFileNewCCFile();
+    void onFileNewHeaderFile();
+    void onFileOpenFile();
+    void onFileOpenFolder();
+    void onSystemQuit();
+    void onPluginAddSnippet();
+    void onWindowCloseTab();
+    void onEditCopy();
+    void onEditCut();
+    void onEditPaste();
+    void onEditFind();
+    void onWindowSplitWindow();
+    void onHelpAbout();
+  };  // class Controller
+}  // namespace Menu
+#endif  // JUCI_MENU_H_
diff --git a/juci/source.cc b/juci/source.cc
new file mode 100644
index 0000000..8070f7e
--- /dev/null
+++ b/juci/source.cc
@@ -0,0 +1,47 @@
+#include "source.h"
+#include <iostream>
+
+using namespace std;
+
+
+//////////////
+//// View ////
+//////////////
+Source::View::View() {
+  cout << "View construktor run" << endl;
+}
+
+void Source::View::UpdateLine(Glib::RefPtr<Gtk::TextBuffer::Mark> mark) {
+  cout << "Update line called. linum: " << mark->get_iter().get_line() << endl;
+}
+
+///////////////
+//// Model ////
+///////////////
+Source::Model::Model(){
+  cout << "Model construktor run" << endl;
+}
+
+////////////////////
+//// Controller ////
+////////////////////
+
+/**
+ *
+ */
+Source::Controller::Controller() {
+  cout << "Controller construktor run" << endl;
+}
+/**
+ *
+ */
+std::shared_ptr<Source::View> Source::Controller::sourceview() {
+  sourceview();
+  return std::shared_ptr<Source::View>(&sourceview_);
+}
+/**
+ *
+ */
+void Source::Controller::OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark){
+
+}
diff --git a/juci/source.h b/juci/source.h
new file mode 100644
index 0000000..773b15e
--- /dev/null
+++ b/juci/source.h
@@ -0,0 +1,31 @@
+#ifndef JUCI_SOURCE_H_
+#define JUCI_SOURCE_H_
+
+#include <iostream>
+#include "gtkmm.h"
+
+namespace Source {
+  class View : public Gtk::TextView {
+  public:
+    View();
+    void UpdateLine(Glib::RefPtr<Gtk::TextBuffer::Mark> mark);
+  private:
+    void UpdateSyntaxHighlighting(int line_number);
+  };
+
+  class Model{
+  public:
+    Model();
+  };
+
+  class Controller {
+  public:
+    Controller();
+    std::shared_ptr<Source::View> sourceview();
+  private:
+    void OnLineEdit(Glib::RefPtr<Gtk::TextBuffer::Mark> mark);
+  protected:
+    View sourceview_;
+  };  // class Controller
+}  // namespace Source
+#endif  // JUCI_SOURCE_H_
diff --git a/juci/window.cc b/juci/window.cc
index 7c25a9d..5675c4a 100644
--- a/juci/window.cc
+++ b/juci/window.cc
@@ -1,26 +1,16 @@
 #include "juci.h"
 
 Window::Window() :
-        window_box_(Gtk::ORIENTATION_HORIZONTAL),
-        menu() {
-
-
-    set_title("example juCi++");
-    set_default_size(600, 600);
-
-    add(window_box_);
-
-    add_accel_group(menu.ui_manager()->get_accel_group());
-
-    window_box_.pack_start(menu.view());
-
-
-    show_all_children();
-};
-
-
-Window::~Window() {
-
+  window_box_(Gtk::ORIENTATION_HORIZONTAL),
+  menu(),
+  source_() {
+  set_title("example juCi++");
+  set_default_size(600, 600);
+  //  window_box_.add(*source_.sourceview());
+  add(window_box_);
+  add_accel_group(menu.ui_manager()->get_accel_group());
+  window_box_.pack_start(menu.view());
+  show_all_children();
 }