From 17616100df604a60c65f1acff69991cbad52caa7 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sat, 9 Jun 2018 21:59:43 +0200
Subject: [PATCH] Added alternate screen support for unix systems

---
 .idea/workspace.xml                   | 1119 ++++++++++++++-----------
 Cargo.toml                            |    6 +-
 examples/bin.rs                       |    6 +-
 examples/cursor/mod.rs                |   23 +-
 examples/terminal/alternate_screen.rs |  200 +++--
 examples/terminal/mod.rs              |    2 +-
 examples/terminal/terminal.rs         |   53 +-
 src/cursor/ansi_cursor.rs             |   80 +-
 src/cursor/cursor.rs                  |   57 +-
 src/cursor/mod.rs                     |   25 +-
 src/cursor/winapi_cursor.rs           |   18 +-
 src/kernel/mod.rs                     |    3 +-
 src/kernel/unix_kernel/terminal.rs    |   13 +-
 src/kernel/windows_kernel/handle.rs   |   78 ++
 src/lib.rs                            |    5 +-
 src/manager/ansi_manager.rs           |   63 ++
 src/manager/manager.rs                |   45 +
 src/manager/mod.rs                    |   21 +
 src/manager/terminal.rs               |   86 ++
 src/manager/win_manager.rs            |    4 +
 src/shared/functions.rs               |   13 +-
 src/shared/traits.rs                  |    8 +-
 src/state/commands/mod.rs             |   11 +-
 src/state/commands/shared_commands.rs |   24 +-
 src/state/commands/unix_command.rs    |   10 +-
 src/state/commands/win_commands.rs    |    8 +-
 src/state/context.rs                  |   30 +-
 src/style/color/ansi_color.rs         |   29 +-
 src/style/color/color.rs              |   80 +-
 src/style/color/mod.rs                |   11 +-
 src/style/mod.rs                      |    2 +-
 src/style/styles/objectstyle.rs       |    7 +-
 src/style/styles/styledobject.rs      |   13 +-
 src/terminal/ansi_terminal.rs         |   77 +-
 src/terminal/mod.rs                   |   28 +-
 src/terminal/raw.rs                   |  164 ++--
 src/terminal/screen.rs                |  105 +--
 src/terminal/terminal.rs              |   30 +-
 38 files changed, 1557 insertions(+), 1000 deletions(-)
 create mode 100644 src/kernel/windows_kernel/handle.rs
 create mode 100644 src/manager/ansi_manager.rs
 create mode 100644 src/manager/manager.rs
 create mode 100644 src/manager/mod.rs
 create mode 100644 src/manager/terminal.rs
 create mode 100644 src/manager/win_manager.rs

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0c3021d..28791c7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,43 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="310aeab2-4737-4e8e-b7eb-0aac10d104a3" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.toml" afterDir="false" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/manager/ansi_manager.rs" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/manager/manager.rs" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/manager/mod.rs" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/manager/terminal.rs" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/manager/win_manager.rs" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/Cargo.toml" afterPath="$PROJECT_DIR$/Cargo.toml" />
+      <change beforePath="$PROJECT_DIR$/examples/bin.rs" afterPath="$PROJECT_DIR$/examples/bin.rs" />
+      <change beforePath="$PROJECT_DIR$/examples/cursor/mod.rs" afterPath="$PROJECT_DIR$/examples/cursor/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/examples/terminal/alternate_screen.rs" afterPath="$PROJECT_DIR$/examples/terminal/alternate_screen.rs" />
+      <change beforePath="$PROJECT_DIR$/examples/terminal/mod.rs" afterPath="$PROJECT_DIR$/examples/terminal/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/examples/terminal/terminal.rs" afterPath="$PROJECT_DIR$/examples/terminal/terminal.rs" />
+      <change beforePath="$PROJECT_DIR$/src/cursor/ansi_cursor.rs" afterPath="$PROJECT_DIR$/src/cursor/ansi_cursor.rs" />
+      <change beforePath="$PROJECT_DIR$/src/cursor/cursor.rs" afterPath="$PROJECT_DIR$/src/cursor/cursor.rs" />
+      <change beforePath="$PROJECT_DIR$/src/cursor/mod.rs" afterPath="$PROJECT_DIR$/src/cursor/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/cursor/winapi_cursor.rs" afterPath="$PROJECT_DIR$/src/cursor/winapi_cursor.rs" />
+      <change beforePath="$PROJECT_DIR$/src/kernel/mod.rs" afterPath="$PROJECT_DIR$/src/kernel/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs" afterPath="$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs" />
+      <change beforePath="$PROJECT_DIR$/src/lib.rs" afterPath="$PROJECT_DIR$/src/lib.rs" />
+      <change beforePath="$PROJECT_DIR$/src/shared/functions.rs" afterPath="$PROJECT_DIR$/src/shared/functions.rs" />
+      <change beforePath="$PROJECT_DIR$/src/shared/traits.rs" afterPath="$PROJECT_DIR$/src/shared/traits.rs" />
+      <change beforePath="$PROJECT_DIR$/src/state/commands/mod.rs" afterPath="$PROJECT_DIR$/src/state/commands/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/state/commands/shared_commands.rs" afterPath="$PROJECT_DIR$/src/state/commands/shared_commands.rs" />
+      <change beforePath="$PROJECT_DIR$/src/state/commands/unix_command.rs" afterPath="$PROJECT_DIR$/src/state/commands/unix_command.rs" />
+      <change beforePath="$PROJECT_DIR$/src/state/commands/win_commands.rs" afterPath="$PROJECT_DIR$/src/state/commands/win_commands.rs" />
+      <change beforePath="$PROJECT_DIR$/src/state/context.rs" afterPath="$PROJECT_DIR$/src/state/context.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/color/ansi_color.rs" afterPath="$PROJECT_DIR$/src/style/color/ansi_color.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/color/color.rs" afterPath="$PROJECT_DIR$/src/style/color/color.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/color/mod.rs" afterPath="$PROJECT_DIR$/src/style/color/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/mod.rs" afterPath="$PROJECT_DIR$/src/style/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/styles/objectstyle.rs" afterPath="$PROJECT_DIR$/src/style/styles/objectstyle.rs" />
+      <change beforePath="$PROJECT_DIR$/src/style/styles/styledobject.rs" afterPath="$PROJECT_DIR$/src/style/styles/styledobject.rs" />
+      <change beforePath="$PROJECT_DIR$/src/terminal/ansi_terminal.rs" afterPath="$PROJECT_DIR$/src/terminal/ansi_terminal.rs" />
+      <change beforePath="$PROJECT_DIR$/src/terminal/mod.rs" afterPath="$PROJECT_DIR$/src/terminal/mod.rs" />
+      <change beforePath="$PROJECT_DIR$/src/terminal/raw.rs" afterPath="$PROJECT_DIR$/src/terminal/raw.rs" />
+      <change beforePath="$PROJECT_DIR$/src/terminal/screen.rs" afterPath="$PROJECT_DIR$/src/terminal/screen.rs" />
+      <change beforePath="$PROJECT_DIR$/src/terminal/terminal.rs" afterPath="$PROJECT_DIR$/src/terminal/terminal.rs" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,98 +49,22 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="cursor.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/cursor/cursor.rs">
+      <file leaf-file-name="mod.rs" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/examples/color/mod.rs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
-              <caret line="247" column="28" selection-start-line="247" selection-start-column="28" selection-end-line="247" selection-end-column="28" />
+            <state relative-caret-position="494">
+              <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ansi_terminal.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/terminal/ansi_terminal.rs">
+      <file leaf-file-name="alternate_screen.rs" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/examples/terminal/alternate_screen.rs">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="155">
-              <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="ansi_cursor.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/cursor/ansi_cursor.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="23" column="5" selection-end-line="1" selection-end-column="79" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="objectstyle.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/style/styles/objectstyle.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="43" selection-start-column="43" selection-end-column="43" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="styledobject.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/style/styles/styledobject.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="101" selection-start-column="101" selection-end-column="101" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="color.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/style/color/color.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="53">
-              <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="1" />
-              <folding>
-                <element signature="e#3702#3703#0" expanded="true" />
-                <element signature="e#3740#3741#0" expanded="true" />
-                <element signature="e#4742#4743#0" expanded="true" />
-                <element signature="e#4781#4782#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="lib.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/lib.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Cargo.toml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/Cargo.toml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="408">
-              <caret line="24" column="19" lean-forward="true" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="shared_commands.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/state/commands/shared_commands.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="459">
-              <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="terminal.rs" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/terminal/terminal.rs">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="291">
-              <caret line="141" selection-start-line="141" selection-end-line="141" />
+            <state relative-caret-position="187">
+              <caret line="109" column="0" lean-forward="true" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -121,19 +80,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>clear_en</find>
-      <find>singleton</find>
-      <find>IState</find>
-      <find>Context</find>
-      <find>self.changed_states</find>
-      <find>undo</find>
-      <find>ICommand</find>
-      <find>empty</find>
-      <find>execute</find>
-      <find>register</find>
-      <find>ScreenContext</find>
-      <find>tomain</find>
-      <find>State</find>
       <find>write</find>
       <find>set</find>
       <find>make</find>
@@ -143,7 +89,6 @@
       <find>wincon</find>
       <find>Empty</find>
       <find>winapi</find>
-      <find>HANDLE</find>
       <find>Construct</find>
       <find>EnableRawModeCommandretu</find>
       <find>return</find>
@@ -151,9 +96,28 @@
       <find>clear</find>
       <find>context</find>
       <find>self.</find>
+      <find>output</find>
+      <find>std</find>
+      <find>stdout</find>
+      <find>'terminal</find>
+      <find>&amp;Terminal</find>
+      <find>&amp;self.term</find>
+      <find>HANDLE</find>
+      <find>command</find>
+      <find>Context</find>
+      <find>End</find>
+      <find>terminal</find>
+      <find>termina</find>
+      <find>screen</find>
+      <find>colored_terminal</find>
     </findStrings>
     <replaceStrings>
       <replace>crossterm_cursor</replace>
+      <replace>'context</replace>
+      <replace>context</replace>
+      <replace>&amp;self.context</replace>
+      <replace>&amp;Context</replace>
+      <replace>Terminal</replace>
     </replaceStrings>
     <dirStrings>
       <dir>D:\Windows\GIT\crossterm\src</dir>
@@ -163,60 +127,65 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/crossterm_state/commands/shared_commands.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_state/commands/unix_command.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_state/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/color/color.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/color/ansi_color.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/styles/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/styles/styledobject.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/styles/objectstyle.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_terminal/ansi_terminal.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_cursor/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_terminal/winapi_terminal.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_terminal/terminal.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_terminal/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_cursor/winapi_cursor.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/color/mod.rs" />
-        <option value="$PROJECT_DIR$/src/crossterm_style/color/winapi_color.rs" />
-        <option value="$PROJECT_DIR$/src/kernel/mod.rs" />
-        <option value="$PROJECT_DIR$/src/kernel/unix_kernel/mod.rs" />
-        <option value="$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs" />
-        <option value="$PROJECT_DIR$/src/kernel/windows_kernel/mod.rs" />
         <option value="$PROJECT_DIR$/src/kernel/windows_kernel/kernel.rs" />
-        <option value="$PROJECT_DIR$/src/shared/mod.rs" />
         <option value="$PROJECT_DIR$/src/kernel/windows_kernel/cursor.rs" />
         <option value="$PROJECT_DIR$/src/crossterm_state/commands/win_commands.rs" />
         <option value="$PROJECT_DIR$/src/crossterm_state/context.rs" />
         <option value="$PROJECT_DIR$/src/crossterm_terminal/screen/mod.rs" />
         <option value="$PROJECT_DIR$/src/crossterm_terminal/raw_terminal.rs" />
         <option value="$PROJECT_DIR$/src/crossterm_terminal/raw.rs" />
-        <option value="$PROJECT_DIR$/src/lib.rs" />
         <option value="$PROJECT_DIR$/examples/color/mod.rs" />
-        <option value="$PROJECT_DIR$/examples/cursor/mod.rs" />
-        <option value="$PROJECT_DIR$/examples/terminal/terminal.rs" />
         <option value="$PROJECT_DIR$/src/terminal/winapi_terminal.rs" />
+        <option value="$PROJECT_DIR$/src/kernel/windows_kernel/ansi_support.rs" />
+        <option value="$PROJECT_DIR$/examples/terminal/raw_mode.rs" />
+        <option value="$PROJECT_DIR$/src/terminal/current_stdout.rs" />
+        <option value="$PROJECT_DIR$/src/manager/screen_manager.rs" />
+        <option value="$PROJECT_DIR$/src/shared/traits.rs" />
+        <option value="$PROJECT_DIR$/src/cursor/winapi_cursor.rs" />
+        <option value="$PROJECT_DIR$/src/manager/win_manager.rs" />
+        <option value="$PROJECT_DIR$/Cargo.toml" />
+        <option value="$PROJECT_DIR$/src/kernel/mod.rs" />
+        <option value="$PROJECT_DIR$/examples/terminal/mod.rs" />
         <option value="$PROJECT_DIR$/src/state/context.rs" />
+        <option value="$PROJECT_DIR$/src/shared/terminal.rs" />
+        <option value="$PROJECT_DIR$/src/shared/mod.rs" />
+        <option value="$PROJECT_DIR$/src/lib.rs" />
+        <option value="$PROJECT_DIR$/src/cursor/mod.rs" />
+        <option value="$PROJECT_DIR$/src/state/commands/mod.rs" />
+        <option value="$PROJECT_DIR$/src/state/commands/win_commands.rs" />
+        <option value="$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs" />
         <option value="$PROJECT_DIR$/src/terminal/raw.rs" />
         <option value="$PROJECT_DIR$/src/shared/functions.rs" />
-        <option value="$PROJECT_DIR$/src/cursor/cursor.rs" />
-        <option value="$PROJECT_DIR$/src/style/color/color.rs" />
-        <option value="$PROJECT_DIR$/src/terminal/screen.rs" />
-        <option value="$PROJECT_DIR$/src/terminal/terminal.rs" />
-        <option value="$PROJECT_DIR$/src/kernel/windows_kernel/ansi_support.rs" />
-        <option value="$PROJECT_DIR$/src/terminal/mod.rs" />
-        <option value="$PROJECT_DIR$/examples/terminal/mod.rs" />
-        <option value="$PROJECT_DIR$/examples/terminal/raw_mode.rs" />
-        <option value="$PROJECT_DIR$/examples/terminal/alternate_screen.rs" />
-        <option value="$PROJECT_DIR$/examples/bin.rs" />
+        <option value="$PROJECT_DIR$/examples/terminal/terminal.rs" />
         <option value="$PROJECT_DIR$/src/state/commands/unix_command.rs" />
+        <option value="$PROJECT_DIR$/src/cursor/cursor.rs" />
+        <option value="$PROJECT_DIR$/examples/bin.rs" />
+        <option value="$PROJECT_DIR$/examples/cursor/mod.rs" />
+        <option value="$PROJECT_DIR$/src/terminal/screen.rs" />
+        <option value="$PROJECT_DIR$/src/terminal/mod.rs" />
+        <option value="$PROJECT_DIR$/src/manager/ansi_manager.rs" />
+        <option value="$PROJECT_DIR$/src/manager/mod.rs" />
         <option value="$PROJECT_DIR$/src/state/commands/shared_commands.rs" />
-        <option value="$PROJECT_DIR$/src/state/commands/win_commands.rs" />
-        <option value="$PROJECT_DIR$/Cargo.toml" />
+        <option value="$PROJECT_DIR$/src/terminal/terminal.rs" />
+        <option value="$PROJECT_DIR$/src/manager/manager.rs" />
+        <option value="$PROJECT_DIR$/src/cursor/ansi_cursor.rs" />
+        <option value="$PROJECT_DIR$/src/style/color/mod.rs" />
+        <option value="$PROJECT_DIR$/src/style/color/ansi_color.rs" />
+        <option value="$PROJECT_DIR$/src/style/mod.rs" />
+        <option value="$PROJECT_DIR$/src/style/color/color.rs" />
+        <option value="$PROJECT_DIR$/src/terminal/ansi_terminal.rs" />
+        <option value="$PROJECT_DIR$/src/style/styles/objectstyle.rs" />
+        <option value="$PROJECT_DIR$/src/manager/terminal.rs" />
+        <option value="$PROJECT_DIR$/src/style/styles/styledobject.rs" />
+        <option value="$PROJECT_DIR$/examples/terminal/alternate_screen.rs" />
       </list>
     </option>
   </component>
@@ -230,10 +199,10 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="2576" />
-    <option name="height" value="1056" />
+    <option name="x" value="67" />
+    <option name="y" value="27" />
+    <option name="width" value="1237" />
+    <option name="height" value="1053" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -252,10 +221,22 @@
     </entry>
   </component>
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="PackagesPane" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -268,6 +249,18 @@
               <item name="crossterm" type="462c0819:PsiDirectoryNode" />
               <item name="examples" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="examples" type="462c0819:PsiDirectoryNode" />
+              <item name="color" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="examples" type="462c0819:PsiDirectoryNode" />
+              <item name="cursor" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
               <item name="crossterm" type="462c0819:PsiDirectoryNode" />
@@ -285,6 +278,31 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="cursor" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="kernel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="kernel" type="462c0819:PsiDirectoryNode" />
+              <item name="unix_kernel" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="manager" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
+              <item name="crossterm" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="shared" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="crossterm" type="b2602c69:ProjectViewProjectNode" />
               <item name="crossterm" type="462c0819:PsiDirectoryNode" />
@@ -328,9 +346,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="AndroidView" />
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -343,6 +360,8 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/manager" />
+      <recent name="$PROJECT_DIR$/src/shared" />
       <recent name="D:\Windows\GIT\crossterm\src\crossterm_terminal" />
       <recent name="D:\Windows\GIT\crossterm\src\crossterm_state" />
       <recent name="D:\Windows\GIT\crossterm\src\shared" />
@@ -363,11 +382,27 @@
   <component name="RunManager">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="WIDTH" value="0" />
+      <option name="HEIGHT" value="0" />
+      <module />
     </configuration>
     <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
     </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" />
@@ -377,13 +412,24 @@
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="singleModule" />
       </option>
+      <envs />
       <patterns />
     </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
     <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="SUITE_NAME" />
@@ -396,22 +442,18 @@
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
       <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
         <value defaultName="singleModule" />
       </option>
       <option name="USE_DEFAULT_REPORTERS" value="false" />
       <option name="PROPERTIES_FILE" />
+      <envs />
       <properties />
       <listeners />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
     <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
       <module name="" />
       <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -419,6 +461,9 @@
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
   </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -488,73 +533,96 @@
       <workItem from="1520619658933" duration="5888000" />
       <workItem from="1520669545287" duration="18115000" />
       <workItem from="1526817152780" duration="2421000" />
+      <workItem from="1526824263282" duration="2837000" />
+      <workItem from="1526912411116" duration="8336000" />
+      <workItem from="1527019143599" duration="1282000" />
+      <workItem from="1527098742813" duration="4571000" />
+      <workItem from="1527185559728" duration="3534000" />
+      <workItem from="1527271060631" duration="4829000" />
+      <workItem from="1527349121159" duration="213000" />
+      <workItem from="1527364869911" duration="1575000" />
+      <workItem from="1527423763780" duration="4758000" />
+      <workItem from="1527530529319" duration="4423000" />
+      <workItem from="1527611031846" duration="5956000" />
+      <workItem from="1527620273378" duration="2641000" />
+      <workItem from="1527699352825" duration="4878000" />
+      <workItem from="1527749111801" duration="12079000" />
+      <workItem from="1527872516099" duration="4658000" />
+      <workItem from="1527923002210" duration="10020000" />
+      <workItem from="1528027126381" duration="4804000" />
+      <workItem from="1528128122736" duration="6228000" />
+      <workItem from="1528200485380" duration="11269000" />
+      <workItem from="1528305149128" duration="8128000" />
+      <workItem from="1528395000021" duration="4555000" />
+      <workItem from="1528524165703" duration="4198000" />
+      <workItem from="1528547275121" duration="16630000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="353895000" />
+    <option name="totallyTimeSpent" value="486297000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="2576" height="1056" extended-state="6" />
+    <frame x="67" y="27" width="2493" height="1055" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="right" id="Cargo" order="9" />
-      <window_info anchor="right" id="Palette&#9;" order="5" />
-      <window_info id="Image Layers" order="6" />
-      <window_info anchor="right" id="Capture Analysis" order="7" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.503125" side_tool="true" weight="0.27041358" />
-      <window_info anchor="right" id="Maven Projects" order="4" />
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.33722162" />
-      <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="8" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11328125" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.496875" visible="true" weight="0.17003188" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info id="UI Designer" order="4" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info id="Favorites" order="5" side_tool="true" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Cargo" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27038628" sideWeight="0.503125" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33722162" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13397513" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Database Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24181627" sideWeight="0.496875" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4984375" visible="true" weight="0.24708377" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Capture Analysis" order="8" />
-      <window_info id="Capture Tool" order="2" />
-      <window_info anchor="right" id="Cargo" order="4" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1140625" />
-      <window_info id="Structure" order="1" weight="0.25" />
-      <window_info anchor="right" id="Commander" order="0" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info id="Image Layers" order="5" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="right" id="Theme Preview" order="9" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.5015625" side_tool="true" visible="true" weight="0.24708377" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="right" id="Maven Projects" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cargo" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24708377" sideWeight="0.5015625" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1140625" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24708377" sideWeight="0.4984375" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
     </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -563,367 +631,412 @@
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/.cargo/registry/src/github.com-1ecc6299db9ec823/termios-0.3.0/src/lib.rs" />
-    <entry file="file://$PROJECT_DIR$/src/style/styles/mod.rs">
+    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libstd/io/mod.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="4" selection-start-column="4" selection-end-column="4" />
+        <state relative-caret-position="483">
+          <caret line="1149" column="29" lean-forward="false" selection-start-line="1149" selection-start-column="29" selection-end-line="1149" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/mod.rs">
+    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/handle.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-901">
-          <caret line="1" column="82" lean-forward="true" selection-start-line="1" selection-start-column="82" selection-end-line="1" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Temp/from.url" />
-    <entry file="file://$PROJECT_DIR$/src/style/color/ansi_color.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="23" lean-forward="true" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/color/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/color/winapi_color.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-975">
-          <caret line="34" column="45" selection-start-line="34" selection-start-column="45" selection-end-line="34" selection-end-column="45" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/unix_kernel/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="134" column="29" lean-forward="true" selection-start-line="134" selection-start-column="29" selection-end-line="134" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="63" selection-start-column="63" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/shared/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="83" selection-start-column="83" selection-end-column="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/shared/traits.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/kernel.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="105" selection-start-column="105" selection-end-column="105" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-pc-windows-msvc/lib/rustlib/src/rust/src/libcore/convert.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="326" column="10" selection-start-line="326" selection-start-column="10" selection-end-line="326" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/color/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2125">
-          <caret line="125" column="28" selection-start-line="125" selection-start-column="28" selection-end-line="125" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/cursor/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="1" lean-forward="true" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/winapi_terminal.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/target/doc/src/crossterm/crossterm_style/styles/styledobject.rs.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="54" selection-start-line="12" selection-start-column="54" selection-end-line="12" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-pc-windows-msvc/lib/rustlib/src/rust/src/libstd/io/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="969" column="10" selection-start-line="969" selection-start-column="10" selection-end-line="969" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/state/commands/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="489">
-          <caret line="32" column="7" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$USER_HOME$/.cargo/registry/src/github.com-1ecc6299db9ec823/winapi-0.3.4/src/shared/minwindef.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="20" column="9" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/shared/macros.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="40" selection-start-line="3" selection-start-column="35" selection-end-line="3" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/cursor/winapi_cursor.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/shared/functions.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="489">
-          <caret line="38" column="39" selection-start-line="38" selection-start-column="39" selection-end-line="38" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/cursor.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="34">
-          <caret line="2" column="11" selection-start-line="2" selection-start-column="11" selection-end-line="2" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/raw.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1241">
-          <caret line="79" column="17" selection-start-line="79" selection-start-column="17" selection-end-line="79" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/terminal.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="1" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/ansi_support.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
+        <state relative-caret-position="494">
+          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/screen.rs">
+    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libstd/io/stdio.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="14" column="49" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
-          <folding>
-            <element signature="e#1875#1876#0" expanded="true" />
-            <element signature="e#1902#1903#0" expanded="true" />
-            <element signature="e#1999#2000#0" expanded="true" />
-            <element signature="e#2030#2031#0" expanded="true" />
-            <element signature="e#2138#2139#0" expanded="true" />
-            <element signature="e#2175#2176#0" expanded="true" />
-            <element signature="e#2220#2221#0" expanded="true" />
-            <element signature="e#2254#2255#0" expanded="true" />
-            <element signature="e#2331#2332#0" expanded="true" />
-            <element signature="e#2411#2412#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="9828">
+          <caret line="396" column="7" lean-forward="false" selection-start-line="396" selection-start-column="7" selection-end-line="396" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/mod.rs">
+    <entry file="file://$PROJECT_DIR$/src/cursor/winapi_cursor.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="576">
-          <caret line="37" column="90" selection-start-line="37" selection-start-column="90" selection-end-line="37" selection-end-column="90" />
+        <state relative-caret-position="572">
+          <caret line="26" column="49" lean-forward="false" selection-start-line="26" selection-start-column="49" selection-end-line="26" selection-end-column="49" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/examples/terminal/terminal.rs">
+    <entry file="file://$PROJECT_DIR$/src/kernel/mod.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1035">
-          <caret line="136" selection-start-line="136" selection-end-line="136" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/terminal/mod.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
+        <state relative-caret-position="182">
+          <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/examples/terminal/raw_mode.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-column="48" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="48" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/examples/terminal/alternate_screen.rs">
+    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/terminal.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="374">
-          <caret line="22" column="28" selection-start-line="22" selection-start-column="28" selection-end-line="23" selection-end-column="32" />
+        <state relative-caret-position="182">
+          <caret line="7" column="1" lean-forward="false" selection-start-line="7" selection-start-column="1" selection-end-line="7" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/cursor/mod.rs">
+    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libcore/result.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" selection-start-line="18" selection-end-line="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/examples/bin.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="18" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
+        <state relative-caret-position="20072">
+          <caret line="778" column="11" lean-forward="false" selection-start-line="778" selection-start-column="11" selection-end-line="778" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/state/mod.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="15" selection-start-column="15" selection-end-column="15" />
+        <state relative-caret-position="0">
+          <caret line="0" column="15" lean-forward="false" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/shared/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="130">
+          <caret line="5" column="18" lean-forward="false" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/terminal/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="26">
+          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/kernel/windows_kernel/cursor.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="25" column="7" lean-forward="false" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/cursor/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="395">
+          <caret line="38" column="7" lean-forward="false" selection-start-line="38" selection-start-column="7" selection-end-line="38" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libcore/cell.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17056">
+          <caret line="690" column="11" lean-forward="false" selection-start-line="690" selection-start-column="11" selection-end-line="690" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/terminal/raw.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="501">
+          <caret line="64" column="18" lean-forward="false" selection-start-line="64" selection-start-column="18" selection-end-line="64" selection-end-column="18" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/state/commands/win_commands.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="193" column="41" selection-start-line="193" selection-start-column="41" selection-end-line="193" selection-end-column="41" />
+        <state relative-caret-position="3770">
+          <caret line="145" column="11" lean-forward="false" selection-start-line="145" selection-start-column="11" selection-end-line="145" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/state/commands/unix_command.rs">
+    <entry file="file://$USER_HOME$/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src/libstd/sync/mutex.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="98" column="5" selection-start-line="98" selection-start-column="5" selection-end-line="98" selection-end-column="5" />
+        <state relative-caret-position="296">
+          <caret line="227" column="11" lean-forward="false" selection-start-line="227" selection-start-column="11" selection-end-line="227" selection-end-column="11" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/state/context.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-32">
-          <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
+        <state relative-caret-position="286">
+          <caret line="11" column="11" lean-forward="false" selection-start-line="11" selection-start-column="11" selection-end-line="11" selection-end-column="11" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/styles/objectstyle.rs">
+    <entry file="file://$PROJECT_DIR$/src/state/commands/mod.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="43" selection-start-column="43" selection-end-column="43" />
+        <state relative-caret-position="317">
+          <caret line="32" column="7" lean-forward="false" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/styles/styledobject.rs">
+    <entry file="file://$PROJECT_DIR$/src/kernel/unix_kernel/terminal.rs">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="101" selection-start-column="101" selection-end-column="101" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/ansi_terminal.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/cursor/ansi_cursor.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="23" column="5" selection-end-line="1" selection-end-column="79" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/state/commands/shared_commands.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/cursor/cursor.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="247" column="28" selection-start-line="247" selection-start-column="28" selection-end-line="247" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/terminal/terminal.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="141" selection-start-line="141" selection-end-line="141" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/style/color/color.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="53">
-          <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="1" />
-          <folding>
-            <element signature="e#3702#3703#0" expanded="true" />
-            <element signature="e#3740#3741#0" expanded="true" />
-            <element signature="e#4742#4743#0" expanded="true" />
-            <element signature="e#4781#4782#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/lib.rs">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="10" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
+        <state relative-caret-position="296">
+          <caret line="123" column="7" lean-forward="false" selection-start-line="123" selection-start-column="7" selection-end-line="123" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Cargo.toml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="24" column="19" lean-forward="true" selection-start-line="24" selection-start-column="19" selection-end-line="24" selection-end-column="19" />
+        <state relative-caret-position="442">
+          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/bin.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="19" column="22" lean-forward="false" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
+          <folding>
+            <element signature="e#420#421#0" expanded="false" />
+            <element signature="e#449#450#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/cursor/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="756">
+          <caret line="105" column="14" lean-forward="false" selection-start-line="92" selection-start-column="4" selection-end-line="105" selection-end-column="14" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/terminal/terminal.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-2568">
+          <caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/shared/traits.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="338">
+          <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/shared/functions.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="598">
+          <caret line="26" column="13" lean-forward="false" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/terminal/screen.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1224">
+          <caret line="58" column="15" lean-forward="false" selection-start-line="58" selection-start-column="15" selection-end-line="58" selection-end-column="15" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/manager/win_manager.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="4" lean-forward="false" selection-start-line="0" selection-start-column="4" selection-end-line="0" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/terminal/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="682">
+          <caret line="52" column="1" lean-forward="false" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/shared/macros.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="2" column="13" lean-forward="false" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/manager/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="19" column="47" lean-forward="false" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/state/commands/unix_command.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="837">
+          <caret line="84" column="47" lean-forward="false" selection-start-line="84" selection-start-column="47" selection-end-line="84" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/state/commands/shared_commands.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="655">
+          <caret line="30" column="16" lean-forward="false" selection-start-line="30" selection-start-column="16" selection-end-line="30" selection-end-column="16" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/manager/manager.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="40" column="29" lean-forward="false" selection-start-line="40" selection-start-column="29" selection-end-line="40" selection-end-column="29" />
+          <folding>
+            <element signature="e#925#926#0" expanded="false" />
+            <element signature="e#979#980#0" expanded="false" />
+            <element signature="e#1037#1038#0" expanded="false" />
+            <element signature="e#1095#1096#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/manager/ansi_manager.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-312">
+          <caret line="12" column="25" lean-forward="false" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/color/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="12" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/lib.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="416">
+          <caret line="16" column="27" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/color/ansi_color.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="31" column="56" lean-forward="false" selection-start-line="31" selection-start-column="56" selection-end-line="31" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/styles/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="104">
+          <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="702">
+          <caret line="27" column="27" lean-forward="false" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/color/color.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="116" column="1" lean-forward="false" selection-start-line="116" selection-start-column="1" selection-end-line="116" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/terminal/terminal.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="702">
+          <caret line="66" column="7" lean-forward="false" selection-start-line="66" selection-start-column="7" selection-end-line="66" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/terminal/ansi_terminal.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="546">
+          <caret line="32" column="23" lean-forward="false" selection-start-line="32" selection-start-column="23" selection-end-line="32" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/cursor/cursor.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="655">
+          <caret line="280" column="7" lean-forward="false" selection-start-line="280" selection-start-column="7" selection-end-line="280" selection-end-column="7" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/cursor/ansi_cursor.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="54" column="9" lean-forward="false" selection-start-line="54" selection-start-column="9" selection-end-line="54" selection-end-column="9" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/styles/objectstyle.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="33" column="11" lean-forward="false" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" />
+          <folding>
+            <element signature="e#1782#1783#0" expanded="true" />
+            <element signature="e#1819#1820#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/manager/terminal.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="83" column="36" lean-forward="false" selection-start-line="83" selection-start-column="36" selection-end-line="83" selection-end-column="36" />
+          <folding>
+            <element signature="e#546#1069#0" expanded="false" />
+            <element signature="e#1210#2235#0" expanded="false" />
+            <element signature="e#2344#2345#0" expanded="true" />
+            <element signature="e#2427#2428#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/style/styles/styledobject.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="485">
+          <caret line="129" column="32" lean-forward="false" selection-start-line="129" selection-start-column="32" selection-end-line="129" selection-end-column="32" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/color/mod.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="31" column="38" lean-forward="false" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/examples/terminal/alternate_screen.rs">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="109" column="0" lean-forward="true" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/Cargo.toml b/Cargo.toml
index 068191d..f3c4c1c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,4 +22,8 @@ termios = "0.3.0"
 
 [lib]
 name = "crossterm"
-path = "src/lib.rs"
\ No newline at end of file
+path = "src/lib.rs"
+
+[[bin]]
+name = "a"
+path = "examples/bin.rs"
diff --git a/examples/bin.rs b/examples/bin.rs
index 1c28676..eb0dc6a 100644
--- a/examples/bin.rs
+++ b/examples/bin.rs
@@ -11,9 +11,11 @@
 //!   
 //! - Run program with: `cargo run`
 
-extern crate crossterm;
+mod cursor;
+mod terminal;
 
-use crossterm::cursor;
+use terminal::alternate_screen;
 
 fn main() {
+    alternate_screen::t();
 }
\ No newline at end of file
diff --git a/examples/cursor/mod.rs b/examples/cursor/mod.rs
index 9e0f949..2bab4b5 100644
--- a/examples/cursor/mod.rs
+++ b/examples/cursor/mod.rs
@@ -5,12 +5,15 @@
 extern crate crossterm;
 
 use self::crossterm::cursor::{cursor, TerminalCursor};
+use self::crossterm::{Context, Terminal };
 
 /// Set the cursor to position X: 10, Y: 5 in the terminal.
 pub fn goto()
 {
+    let context = Terminal::new();
+
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Set the cursor to position X: 10, Y: 5 in the terminal
     cursor.goto(10,5);    
 }
@@ -18,8 +21,9 @@ pub fn goto()
 /// Move the cursor 3 up | demonstration.
 pub fn move_up()
 {
+    let context = Terminal::new();
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Move the cursor to position 3 times to the up in the terminal
     cursor.move_up(3);
 }
@@ -27,8 +31,9 @@ pub fn move_up()
 /// Move the cursor 3 to the right | demonstration.
 pub fn move_right()
 {
+    let context = Terminal::new();
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Move the cursor to position 3 times to the right in the terminal
     cursor.move_right(3);
 }
@@ -36,8 +41,9 @@ pub fn move_right()
 /// Move the cursor 3 down | demonstration.
 pub fn move_down()
 {
+    let context = Terminal::new();
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Move the cursor to position 3 times to the down in the terminal
     cursor.move_down(3);
 }
@@ -45,8 +51,9 @@ pub fn move_down()
 /// Move the cursor 3 to the left | demonstration.
 pub fn move_left()
 {
+    let context = Terminal::new();
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Move the cursor to position 3 times to the left in the terminal
     cursor.move_left(3);
 }
@@ -54,10 +61,11 @@ pub fn move_left()
 /// Print character at X: 10 Y: 5 | demonstration.
 pub fn print()
 {
+    let context = Terminal::new();
     // To print an some displayable content on an certain position.  
     
     // Get the cursor
-    let mut cursor = cursor();
+    let mut cursor = cursor(&context);
     // Set the cursor to position X: 10, Y: 5 in the terminal
     cursor.goto(10,5);
     // Print the @ symbol at position X: 10, Y: 5 in the terminal
@@ -79,7 +87,8 @@ pub fn print()
 /// Save and reset cursor position | demonstration..
 pub fn safe_and_reset_position()
 {
-    let mut cursor = cursor();
+    let context = Terminal::new();
+    let mut cursor = cursor(&context);
     
     // Goto X: 5 Y: 5
     cursor.goto(5,5);
diff --git a/examples/terminal/alternate_screen.rs b/examples/terminal/alternate_screen.rs
index f8fcea3..f41e734 100644
--- a/examples/terminal/alternate_screen.rs
+++ b/examples/terminal/alternate_screen.rs
@@ -1,73 +1,131 @@
-// alternate screen is not working correctly currently
+ //alternate screen is not working correctly currently
 
 
-//extern crate crossterm;
-//
-//use crossterm::terminal::screen::{AlternateScreen, ToAlternateScreen, ToMainScreen};
-//use crossterm::cursor::cursor;
-//use crossterm::terminal::{self, ClearType};
-//
-//use std::io::{Write, stdout};
-//use std::{time, thread};
-//
-//fn print_wait_screen(screen: &mut Write)
-//{
-//    terminal::terminal().clear(ClearType::All);
-//    write!(screen,
-//    "Welcome to the wait screen.\n\
-//    Please wait a few seconds until we arrive back at the main screen.\n\
-//    Seconds to Go: "
-//    );
-//
-//    let mut counter = 5;
-//    // get cursor instance
-//    let mut cursor = cursor();
-//
-//    // loop until the counter hits 0
-//    loop
-//    {
-//        // 1 second delay
-//        thread::sleep(time::Duration::from_secs(1));
-//        // decrement counter
-//        counter -= 1;
-//
-//        // print the current counter at the line of `Seconds to Go: {counter}`
-//        cursor.goto(15,2).print(counter);
-//
-//        if counter <= 0
-//        {
-//            break;
-//        }
-//    }
-//}
-//
-//pub fn with_alternate_screen_instance()
-//{
-//    // create scope. If this scope ends the screen will be switched back to mainscreen.
-//    // becouse `AlternateScreen` switches back to main screen when switching back.
-//    {
-//        // create new alternate screen instance and switch to the alternate screen.
-//        let mut screen = AlternateScreen::from(stdout());
-//
-//        // Print the wait screen.
-//        print_wait_screen(&mut screen);
-//    }
-//
-//    println!("Whe are back at the main screen");
-//}
-//
-//pub fn manually_switch_to_alternate_screen()
-//{
-//    // You can switch to alternate screen manually but if you forget to switch back your terminal may cause some undefined behavior.
-//
-//    let mut screen = stdout();
-//
-//    // switch to alternate screeen
-//    write!(screen, "{}", ToAlternateScreen);
-//    // load wait screen
-//    print_wait_screen(&mut screen);
-//    // switch back
-//    write!(screen,"{}", ToMainScreen);
-//    println!("Whe are back at the main screen");
-//
-//}
\ No newline at end of file
+extern crate crossterm;
+
+ use self::crossterm::{ Context, Terminal };
+use self::crossterm::cursor::cursor;
+use self::crossterm::terminal::{self, ClearType};
+use self::crossterm::terminal::screen;
+
+use std::io::{Write, stdout};
+use std::{time, thread};
+
+/// this will print an example wait screen.
+fn print_wait_screen(terminal: &Terminal)
+ {
+     // clear the screen and reset the cursor pos
+     terminal::terminal(&terminal).clear(ClearType::All);
+     let mut cursor = cursor(&terminal);
+     cursor.goto(0, 0);
+
+     // we need to create a scope so that or mutex gueard will be dropped. we need the output also some lines future from here.
+     let mut screen_manager = &terminal.screen_manager;
+     {
+         let mut output = screen_manager.lock().unwrap();
+         {
+             write!(output.stdout(),
+                    "Welcome to the wait screen.\n\
+                    Please wait a few seconds until we arrive back at the main screen.\n\n
+                    Possessing: "
+             );
+         }
+     }
+
+     for i in 0..5
+     {
+         // 1 second delay
+         thread::sleep(time::Duration::from_secs(1));
+
+         // print the current counter at the line of `Seconds to Go: {counter}`
+         cursor.goto(11, 5).print(format!("{} of the 5 items initialized!", i));
+     }
+ }
+
+ /// this will switch the to alternate modes for 3 seconds after that it wil stitch back to main screen.
+pub fn switch_to_alternate_screen_and_back()
+{
+    // create scope for the alternate screen when the scope ends the screen will be switched back to mainscreen.
+    let terminal = Terminal::new();
+    {
+        let alternate_screen = screen::AlternateScreen::from(&terminal);
+
+        // Print the wait screen.
+        print_wait_screen(&terminal);
+    }
+
+    terminal::terminal(&terminal).clear(ClearType::All);
+    cursor::cursor(&terminal).goto(0,0);
+    println!("Whe are back at the main screen");
+}
+
+ /// This demonstrates how to switch to alternate screen and main screen.
+ pub fn stress_test()
+ {
+     let terminal = Terminal::new();
+     {
+         // clear main screen
+         terminal::terminal(&terminal).clear(ClearType::All);
+
+         // create alternate screen and switch into that mode.
+         let mut alternate_screen = screen::AlternateScreen::from(&terminal);
+
+         // clear the alternate screen.
+         terminal::terminal(&terminal).clear(ClearType::All);
+
+         // switch to alternate screen and back to main after three seconds
+         write!(alternate_screen, "{}", "We are at the alternatescreen \n");
+         thread::sleep(time::Duration::from_secs(3));
+         alternate_screen.to_main();
+         write!(alternate_screen, "{}", "We are back at the main screen 1\n");
+
+         // switch to alternate screen and back to main after three seconds
+         thread::sleep(time::Duration::from_secs(3));
+         alternate_screen.to_alternate();
+         write!(alternate_screen, "{}", "We are at the alternatescreen 2\n");
+         thread::sleep(time::Duration::from_secs(3));
+         alternate_screen.to_main();
+         write!(alternate_screen, "{}", "We are back at the main screen 2\n");
+
+         // switch to alternate screen and back to main after three seconds
+         thread::sleep(time::Duration::from_secs(3));
+         alternate_screen.to_alternate();
+         write!(alternate_screen, "{}", "We are at the alternatescreen 3\n");
+         thread::sleep(time::Duration::from_secs(3));
+         alternate_screen.to_main();
+         write!(alternate_screen, "{}", "We are back at the main screen 3\n");
+     }
+ }
+
+ pub fn t()
+ {
+     use self::crossterm::cursor::cursor;
+    use self::crossterm::style::Color;
+     use std::io;
+     let terminal = Terminal::new();
+     {
+         let mut alternate_screen = screen::AlternateScreen::from(&terminal);
+         terminal::terminal(&terminal).clear(ClearType::All);
+         write!(alternate_screen, "{}", "We are at the alternatescreen \n");
+
+
+         // Goto X: 5 Y: 5
+         cursor(&terminal).goto(5,5);
+         // Safe cursor position: X: 5 Y: 5
+         cursor(&terminal).save_position();
+         // Goto X: 5 Y: 20
+         cursor(&terminal).goto(5,20);
+         // Print at X: 5 Y: 20.
+         write!(io::stdout(), "{}", terminal.paint("Yea").with(Color::Blue));
+         // Reset back to X: 5 Y: 5.
+         cursor(&terminal).reset_position();
+         // Print Back at X: 5 Y: 5.
+         write!(io::stdout(), "{}", terminal.paint("Back").with(Color::Red));
+
+         println!();
+
+         thread::sleep(time::Duration::from_secs(3));
+     }
+     terminal::terminal(&terminal).clear(ClearType::All);
+     println!("Back at the main screen");
+ }
\ No newline at end of file
diff --git a/examples/terminal/mod.rs b/examples/terminal/mod.rs
index e609256..0f5182a 100644
--- a/examples/terminal/mod.rs
+++ b/examples/terminal/mod.rs
@@ -1,4 +1,4 @@
-mod alternate_screen;
+pub mod alternate_screen;
 mod raw_mode;
 
 
diff --git a/examples/terminal/terminal.rs b/examples/terminal/terminal.rs
index 6c7df0a..e25ddfe 100644
--- a/examples/terminal/terminal.rs
+++ b/examples/terminal/terminal.rs
@@ -4,8 +4,11 @@
 
 extern crate crossterm;
 
-use crossterm::terminal::{ Terminal, ClearType, terminal};
-use crossterm::cursor;
+
+use self::crossterm::terminal::{ ClearType, terminal};
+use self::crossterm::cursor;
+
+use self::crossterm::{ Context, Terminal };
 
 fn print_test_data()
 {
@@ -17,8 +20,9 @@ fn print_test_data()
 /// Clear all lines in terminal | demonstration
 pub fn clear_all_lines()
 {
+    let term = Terminal::new();
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
 
     print_test_data();
 
@@ -29,13 +33,15 @@ pub fn clear_all_lines()
 /// Clear all lines from cursor position X:4, Y:4 down | demonstration
 pub fn clear_from_cursor_down()
 {
+    let term = Terminal::new();
+
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
 
     print_test_data();
 
     // Set terminal cursor position (see example for more info).
-    cursor::cursor().goto(4,8);
+    cursor::cursor(&term).goto(4,8);
 
     // Clear all cells from current cursor position down.
     terminal.clear(ClearType::FromCursorDown);
@@ -44,13 +50,14 @@ pub fn clear_from_cursor_down()
 /// Clear all lines from cursor position X:4, Y:4 up | demonstration
 pub fn clear_from_cursor_up()
 {
+    let term = Terminal::new();
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
 
     print_test_data();
 
     // Set terminal cursor position (see example for more info).
-    cursor::cursor().goto(4,4);
+    cursor::cursor(&term).goto(4,4);
 
     // Clear all cells from current cursor position down.
     terminal.clear(ClearType::FromCursorUp);
@@ -59,13 +66,15 @@ pub fn clear_from_cursor_up()
 /// Clear all lines from cursor position X:4, Y:4 up | demonstration
 pub fn clear_current_line()
 {
+    let term = Terminal::new();
+
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
 
     print_test_data();
 
     // Set terminal cursor position (see example for more info).
-    cursor::cursor().goto(4,4);
+    cursor::cursor(&term).goto(4,4);
 
     // Clear current line cells.
     terminal.clear(ClearType::CurrentLine);
@@ -74,13 +83,15 @@ pub fn clear_current_line()
 /// Clear all lines from cursor position X:4, Y:7 up | demonstration
 pub fn clear_until_new_line()
 {
+    let term = Terminal::new();
+
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
 
     print_test_data();
 
     // Set terminal cursor position (see example for more info).
-    cursor::cursor().goto(4,20);
+    cursor::cursor(&term).goto(4,20);
 
     // Clear all the cells until next line.
     terminal.clear(ClearType::UntilNewLine);
@@ -89,8 +100,10 @@ pub fn clear_until_new_line()
 /// Print the the current terminal size | demonstration.
 pub fn print_terminal_size()
 {
+    let term = Terminal::new();
+
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
     // Get terminal size
     let terminal_size = terminal.terminal_size();
     // Print results
@@ -100,7 +113,9 @@ pub fn print_terminal_size()
 /// Set the terminal size to width 10, height: 10 | demonstration.
 pub fn set_terminal_size()
 {
-    let mut terminal = terminal();
+    let term = Terminal::new();
+
+    let mut terminal = terminal(&term);
 
     terminal.set_size(10,10);
 }
@@ -108,9 +123,11 @@ pub fn set_terminal_size()
 /// Scroll down 10 lines | demonstration.
 pub fn scroll_down()
 {
+    let term = Terminal::new();
+
     print_test_data();
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
     // Scroll down 10 lines.
     terminal.scroll_down(10);
 }
@@ -118,10 +135,12 @@ pub fn scroll_down()
 /// Scroll down 10 lines | demonstration.
 pub fn scroll_up()
 {
+    let term = Terminal::new();
+
     print_test_data();
 
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
     // Scroll up 10 lines.
     terminal.scroll_up(10);
 }
@@ -129,8 +148,10 @@ pub fn scroll_up()
 /// Resize the terminal to X: 10, Y: 10 | demonstration.
 pub fn resize_terminal()
 {
+    let term = Terminal::new();
+
     // Get terminal
-    let mut terminal = terminal();
+    let mut terminal = terminal(&term);
     // Get terminal size
     terminal.set_size(10,10);
 }
diff --git a/src/cursor/ansi_cursor.rs b/src/cursor/ansi_cursor.rs
index b78ffda..2481fee 100644
--- a/src/cursor/ansi_cursor.rs
+++ b/src/cursor/ansi_cursor.rs
@@ -1,62 +1,80 @@
 //! This is an ANSI specific implementation for cursor related action.
 //! This module is used for windows 10 terminals and unix terminals by default.
 
-use Construct;
+use std::sync::Mutex;
+use { Context, ScreenManager, Terminal };
 use shared::functions;
 use super::ITerminalCursor;
-
 use std::io::{ self, Write };
 
-/// This struct is an ansi implementation for cursor related actions.
-pub struct AnsiCursor;
 
-impl Construct for AnsiCursor {
-    fn new() -> Box<AnsiCursor> {
+/// This struct is an ansi implementation for cursor related actions.
+pub struct AnsiCursor
+{ }
+
+impl<'output> AnsiCursor {
+    pub fn new() -> Box<AnsiCursor> {
         Box::from(AnsiCursor {})
     }
 }
 
-impl ITerminalCursor for AnsiCursor {
-    fn goto(&self, x: u16, y: u16) {
-        let mut some_writer = io::stdout();
+impl<'term> ITerminalCursor for AnsiCursor {
+
+    fn goto(&self, x: u16, y: u16, terminal: &Terminal)
+    {
         // ANSI codes are one-based. I want 0 based so we just need to increment and x,y.
-        write!(&mut some_writer, csi!("{};{}H"), y + 1, x +1);
+
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("{};{}H"), y + 1, x +1));
+        }
     }
 
-    fn pos(&self) -> (u16, u16) {
-        functions::get_cursor_position()
+    fn pos(&self, terminal: &Terminal) -> (u16, u16) {
+        functions::get_cursor_position(&terminal)
     }
 
-    fn move_up(&self, count: u16) {
-
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}A"), count);
+    fn move_up(&self, count: u16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("{}A"));
+        }
     }
 
-    fn move_right(&self, count: u16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}C"), count);
+    fn move_right(&self, count: u16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("{}C"));
+        }
     }
 
-    fn move_down(&self, count: u16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}B"), count); 
+    fn move_down(&self, count: u16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("{}B"));
+        }
     }
 
-    fn move_left(&self, count: u16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}D"), count);
+    fn move_left(&self, count: u16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("{}D"));
+        }
     }
 
-    fn save_position(&mut self)
+    fn save_position(&mut self, terminal: &Terminal)
     {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("s"));
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("s"));
+        }
     }
 
-    fn reset_position(&self)
+    fn reset_position(&self, terminal: &Terminal)
     {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("u"));
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("u"));
+        }
     }
 }
diff --git a/src/cursor/cursor.rs b/src/cursor/cursor.rs
index cd1df89..6f24d99 100644
--- a/src/cursor/cursor.rs
+++ b/src/cursor/cursor.rs
@@ -5,27 +5,31 @@
 
 use super::*;
 use shared::functions;
-use {Construct, Context};
+use { Construct, Context,  ScreenManager, Terminal };
 
 use std::fmt::Display;
 use std::ops::Drop;
 
+use std;
+use std::io::Write;
+
 /// Struct that stores an specific platform implementation for cursor related actions.
-pub struct TerminalCursor {
+pub struct TerminalCursor<'term> {
+    terminal: &'term Terminal,
     terminal_cursor: Option<Box<ITerminalCursor>>,
 }
 
-impl TerminalCursor
+impl <'term> TerminalCursor<'term>
 {
     /// Create new cursor instance whereon cursor related actions can be performed.
-    pub fn new() -> TerminalCursor {
+    pub fn new(terminal: &'term Terminal) -> TerminalCursor<'term> {
         #[cfg(target_os = "windows")]
         let cursor = functions::get_module::<Box<ITerminalCursor>>(WinApiCursor::new(), AnsiCursor::new());
 
         #[cfg(not(target_os = "windows"))]
         let cursor = Some(AnsiCursor::new() as Box<ITerminalCursor>);
 
-        TerminalCursor { terminal_cursor: cursor }
+        TerminalCursor { terminal_cursor: cursor , terminal: terminal}
     }
 
     /// Goto some position (x,y) in the terminal.
@@ -41,9 +45,9 @@ impl TerminalCursor
     /// cursor::cursor().goto(10,10);
     /// 
     /// ```
-    pub fn goto(&mut self, x: u16, y: u16) -> &mut TerminalCursor {
+    pub fn goto(&mut self, x: u16, y: u16) -> &mut TerminalCursor<'term> {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.goto(x, y);
+            terminal_cursor.goto(x, y, &self.terminal);
         }
         self
     }
@@ -64,7 +68,7 @@ impl TerminalCursor
     /// ```
     pub fn pos(&mut self) -> (u16, u16) {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.pos()
+            terminal_cursor.pos(&self.terminal)
         } else {
             (0, 0)
         }
@@ -87,9 +91,9 @@ impl TerminalCursor
     /// cursor::cursor().move_up(2);
     /// 
     /// ```
-    pub fn move_up(&mut self, count: u16) -> &mut TerminalCursor {
+    pub fn move_up(&mut self, count: u16) -> &mut TerminalCursor<'term> {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.move_up(count);
+            terminal_cursor.move_up(count, &self.terminal);
         }
         self
     }
@@ -112,9 +116,9 @@ impl TerminalCursor
     /// cursor::cursor().move_right(2);
     /// 
     /// ```
-    pub fn move_right(&mut self, count: u16) -> &mut TerminalCursor {
+    pub fn move_right(&mut self, count: u16) -> &mut TerminalCursor<'term> {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.move_right(count);
+            terminal_cursor.move_right(count, &self.terminal);
         }
         self
     }
@@ -136,9 +140,9 @@ impl TerminalCursor
     /// cursor::cursor().move_down(2);
     ///
     /// ```
-    pub fn move_down(&mut self, count: u16) -> &mut TerminalCursor {
+    pub fn move_down(&mut self, count: u16) -> &mut TerminalCursor<'term> {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.move_down(count);
+            terminal_cursor.move_down(count, &self.terminal);
         }
         self
     }
@@ -160,9 +164,9 @@ impl TerminalCursor
     /// cursor::cursor().move_left(2);
     /// 
     /// ```
-    pub fn move_left(&mut self, count: u16) -> &mut TerminalCursor {
+    pub fn move_left(&mut self, count: u16) -> &mut TerminalCursor<'term> {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.move_left(count);
+            terminal_cursor.move_left(count, &self.terminal);
         }
         self
     }
@@ -199,12 +203,13 @@ impl TerminalCursor
     /// .print("@");
     /// 
     /// ```
-    pub fn print<D: Display>(&mut self, value: D) -> &mut TerminalCursor {
-        print!("{}", value);
-        use std;
-        use std::io::Write;
-        // rust is line buffered so we need to flush the buffer in order to print it at the current cursor position. 
-        std::io::stdout().flush();
+    pub fn print<D: Display>(&mut self, value: D) -> &mut TerminalCursor<'term> {
+        let mut screen = self.terminal.screen_manager.lock().unwrap();
+        {
+            write!(screen.stdout(), "{}", value);
+            // rust is line buffered so we need to flush the buffer in order to print it at the current cursor position.
+            screen.stdout().flush();
+        }
         self
     }
 
@@ -226,7 +231,7 @@ impl TerminalCursor
     pub fn save_position(&mut self)
     {
         if let Some(ref mut terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.save_position();
+            terminal_cursor.save_position(&self.terminal);
         }
     }
 
@@ -248,7 +253,7 @@ impl TerminalCursor
     pub fn reset_position(&mut self)
     {
         if let Some(ref terminal_cursor) = self.terminal_cursor {
-            terminal_cursor.reset_position();
+            terminal_cursor.reset_position(&self.terminal);
         }
     }
 }
@@ -273,6 +278,6 @@ impl TerminalCursor
 /// cursor::cursor().goto(5,10);
 ///
 /// ```
-pub fn cursor() -> Box<TerminalCursor> {
-    Box::from(TerminalCursor::new())
+pub fn cursor<'term>(terminal: &'term Terminal) -> Box<TerminalCursor<'term>> {
+    Box::from(TerminalCursor::new(&terminal))
 }
diff --git a/src/cursor/mod.rs b/src/cursor/mod.rs
index e52a9cd..49b8813 100644
--- a/src/cursor/mod.rs
+++ b/src/cursor/mod.rs
@@ -8,7 +8,7 @@
 //! so that the cursor related actions can be preformed on both unix and windows systems.
 //!
 
-mod cursor;
+pub mod cursor;
 #[cfg(target_os = "windows")]
 mod winapi_cursor;
 mod ansi_cursor;
@@ -17,8 +17,13 @@ mod ansi_cursor;
 use self::winapi_cursor::WinApiCursor;
 use self::ansi_cursor::AnsiCursor;
 
+use { Context, Terminal };
 pub use self::cursor::{ cursor, TerminalCursor };
 
+use std::sync::Mutex;
+
+use ScreenManager;
+
 ///! This trait defines the actions that can be preformed with the terminal cursor.
 ///! This trait can be implemented so that an concrete implementation of the ITerminalCursor can forfill
 ///! the wishes to work on an specific platform.
@@ -29,19 +34,19 @@ pub use self::cursor::{ cursor, TerminalCursor };
 ///! so that cursor related actions can be preformed on both unix and windows systems.
 pub trait ITerminalCursor {
     /// Goto some location (x,y) in the terminal.
-    fn goto(&self, x: u16, y: u16);
-    /// Get the location (x,y) of the current curor in the terminal
-    fn pos(&self) -> (u16, u16);
+    fn goto(&self, x: u16, y: u16,  terminal: &Terminal);
+    /// Get the location (x,y) of the current cusror in the terminal
+    fn pos(&self,  terminal: &Terminal) -> (u16, u16);
     /// Move cursor n times up
-    fn move_up(&self, count: u16);
+    fn move_up(&self, count: u16, terminal: &Terminal);
     /// Move the cursor `n` times to the right.
-    fn move_right(&self, count: u16);
+    fn move_right(&self, count: u16, terminal: &Terminal);
     /// Move the cursor `n` times down.
-    fn move_down(&self, count: u16);
+    fn move_down(&self, count: u16, terminal: &Terminal);
     /// Move the cursor `n` times left.
-    fn move_left(&self, count: u16);
+    fn move_left(&self, count: u16, terminal: &Terminal);
     /// Save cursor position for recall later. Note that this position is stored program based not per instance of the cursor struct.
-    fn save_position(&mut self);
+    fn save_position(&mut self, terminal: &Terminal);
     /// Return to saved cursor position
-    fn reset_position(&self);
+    fn reset_position(&self, terminal: &Terminal);
 }
\ No newline at end of file
diff --git a/src/cursor/winapi_cursor.rs b/src/cursor/winapi_cursor.rs
index 436ad06..770ac24 100644
--- a/src/cursor/winapi_cursor.rs
+++ b/src/cursor/winapi_cursor.rs
@@ -1,7 +1,7 @@
 //! This is an WINAPI specific implementation for cursor related action.
 //! This module is used for windows terminals that do not support ANSI escape codes.
 
-use Construct;
+use {Terminal, Construct};
 use super::ITerminalCursor;
 use kernel::windows_kernel::{kernel, cursor};
 
@@ -16,43 +16,43 @@ impl Construct for WinApiCursor {
 
 impl ITerminalCursor for WinApiCursor {
 
-    fn goto(&self, x: u16, y: u16) {
+    fn goto(&self, x: u16, y: u16, terminal: &Terminal) {
         kernel::set_console_cursor_position(x as i16, y as i16);
     }
 
-    fn pos(&self) -> (u16, u16) {
+    fn pos(&self, terminal: &Terminal) -> (u16, u16) {
         cursor::pos()
     }
 
-    fn move_up(&self, count: u16) {
+    fn move_up(&self, count: u16, terminal: &Terminal) {
         let (xpos,ypos) = self.pos();
         self.goto(xpos, ypos - count);
     }
 
-    fn move_right(&self, count: u16) {
+    fn move_right(&self, count: u16, terminal: &Terminal) {
         let (xpos,ypos) = self.pos();
 
         self.goto(xpos + count, ypos);
     }
 
-    fn move_down(&self, count: u16) {
+    fn move_down(&self, count: u16, terminal: &Terminal) {
         let (xpos,ypos) = self.pos();
 
         self.goto(xpos, ypos + count);
     }
 
-    fn move_left(&self, count: u16) {
+    fn move_left(&self, count: u16, terminal: &Terminal) {
         let (xpos,ypos) = self.pos();
 
         self.goto(xpos - count, ypos);
     }
 
-    fn save_position(&mut self)
+    fn save_position(&mut self, terminal: &Terminal)
     {
         cursor::save_cursor_pos();
     }
 
-    fn reset_position(&self)
+    fn reset_position(&self, terminal: &Terminal)
     {
         cursor::reset_to_saved_position();
     }
diff --git a/src/kernel/mod.rs b/src/kernel/mod.rs
index cb60b57..4103cd9 100644
--- a/src/kernel/mod.rs
+++ b/src/kernel/mod.rs
@@ -3,4 +3,5 @@
 #[cfg(unix)]
 pub mod unix_kernel;
 #[cfg(windows)]
-pub mod windows_kernel;
\ No newline at end of file
+pub mod windows_kernel;
+
diff --git a/src/kernel/unix_kernel/terminal.rs b/src/kernel/unix_kernel/terminal.rs
index 97edbc4..5f1be00 100644
--- a/src/kernel/unix_kernel/terminal.rs
+++ b/src/kernel/unix_kernel/terminal.rs
@@ -1,6 +1,6 @@
 //! This module contains all `unix` specific terminal related logic.
 
-use { libc, Context };
+use { libc, Context, Terminal };
 use termios::Termios;
 pub use self::libc::{termios};
 use self::libc::{STDOUT_FILENO, TIOCGWINSZ, c_ushort, ioctl, c_int};
@@ -40,7 +40,7 @@ pub fn terminal_size() -> (u16,u16) {
 }
 
 /// Get the current cursor position.
-pub fn pos() -> (u16,u16)
+pub fn pos(terminal: &Terminal) -> (u16,u16)
 {
     use std::io::Error;
     use std::io::{ Write,Read };
@@ -48,14 +48,15 @@ pub fn pos() -> (u16,u16)
     let mut context = Context::new();
     {
         let mut command = NoncanonicalModeCommand::new(&mut context);
-        command.0.execute();
+        command.0.execute(&terminal);
 
         // This code is original written by term_cursor credits to them.
-        let mut stdout = io::stdout();
 
+        use std::io;
+        let mut std = io::stdout();
         // Write command
-        stdout.write(b"\x1B[6n");
-        stdout.flush();
+        std.write(b"\x1B[6n");
+        std.flush();
 
         // Read back result
         let mut buf = [0u8; 2];
diff --git a/src/kernel/windows_kernel/handle.rs b/src/kernel/windows_kernel/handle.rs
new file mode 100644
index 0000000..5ba04f2
--- /dev/null
+++ b/src/kernel/windows_kernel/handle.rs
@@ -0,0 +1,78 @@
+use winapi::um::winnt::HANDLE;
+use std::mem::zeroed;
+use winapi::um::processenv::{GetStdHandle};
+use winapi::um::winbase::{STD_OUTPUT_HANDLE, STD_INPUT_HANDLE };
+
+static mut ALTERNATEHANDLE: Option<HANDLE> = None;
+static mut CONSOLE_OUTPUT_HANDLE: Option<HANDLE> = None;
+static mut CONSOLE_INPUT_HANDLE: Option<HANDLE> = None;
+
+
+pub fn register_new_alternate_handle(handle: Handle) -> HANDLE
+{
+    unsafe
+    {
+        ALTERNATEHANDLE = handle;
+    }
+
+    ALTERNATEHANDLE.unwrap();
+}
+
+pub fn clear_alternate_screen()
+{
+    unsafe
+    {
+        ALTERNATEHANDLE = None;
+    }
+}
+
+/// Get the std_output_handle of the console
+pub fn get_output_handle() -> HANDLE {
+    unsafe {
+        if let Some(alternate_handle) = ALTERNATEHANDLE
+        {
+            alternate_handle
+        }
+        else if let Some(handle) = CONSOLE_OUTPUT_HANDLE {
+            handle
+        } else {
+            let handle = GetStdHandle(STD_OUTPUT_HANDLE);
+
+            if !is_valid_handle(&handle)
+                {
+                    panic!("Cannot get output handle")
+                }
+
+            CONSOLE_OUTPUT_HANDLE = Some(handle);
+            handle
+        }
+    }
+}
+
+/// Get the std_input_handle of the console
+pub fn get_input_handle() -> HANDLE {
+    unsafe {
+        if let Some(handle) = CONSOLE_INPUT_HANDLE {
+            handle
+        } else {
+            let handle = GetStdHandle(STD_INPUT_HANDLE);
+
+            if !is_valid_handle(&handle)
+                {
+                    panic!("Cannot get input handle")
+                }
+
+            CONSOLE_INPUT_HANDLE = Some(handle);
+            handle
+        }
+    }
+}
+
+/// Checks if the console handle is an invalid handle value.
+pub fn is_valid_handle(handle: &HANDLE) -> bool {
+    if *handle == INVALID_HANDLE_VALUE {
+        false
+    } else {
+        true
+    }
+}
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index 45658d0..a03115c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,9 +11,12 @@ mod state;
 pub mod cursor;
 pub mod style;
 pub mod terminal;
+pub mod manager;
 
 use shared::traits::{Construct};
-pub use state::{ Context};
+pub use state::{ Context };
+pub use manager::manager::{ ScreenManager };
+pub use manager::terminal::{ Terminal };
 
 #[cfg(windows)]
 extern crate winapi;
diff --git a/src/manager/ansi_manager.rs b/src/manager/ansi_manager.rs
new file mode 100644
index 0000000..691ed5c
--- /dev/null
+++ b/src/manager/ansi_manager.rs
@@ -0,0 +1,63 @@
+use std::io::{self, Write};
+use { Context, Terminal };
+use super::IScreenManager;
+use super::super::state::commands::ICommand;
+use super::super::state::commands::shared_commands::ToAlternateScreenBufferCommand;
+
+pub struct AnsiScreenManager<Output:Write>
+{
+    is_alternate_screen: bool,
+    output: Output,
+}
+
+impl<Output :Write> IScreenManager<Output> for AnsiScreenManager<Output>
+{
+    fn stdout(&mut self) -> &mut Output
+    {
+        return &mut self.output
+    }
+
+    fn register_output(&mut self, output: Output, is_alternate_screen: bool)
+    {
+        self.output = output;
+        self.is_alternate_screen = is_alternate_screen;
+    }
+
+    fn write_ansi(&mut self, string: String)
+    {
+        match self.is_alternate_screen
+        {
+            true =>  write!(self.output, "{}", string),
+            false => write!(io::stdout(), "{}", string),
+        };
+    }
+
+    fn write_ansi_str(&mut self, string: &str)
+    {
+        match self.is_alternate_screen
+            {
+                true =>  write!(self.output, "{}", string),
+                false => write!(io::stdout(), "{}", string),
+            };
+    }
+}
+
+impl AnsiScreenManager<Box<Write>> {
+    pub fn new() -> Self {
+        AnsiScreenManager {
+            output: (Box::from(io::stdout()) as Box<Write>),
+            is_alternate_screen: false
+        }
+    }
+}
+
+impl<Output:Write> Write for AnsiScreenManager<Output>
+{
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+        self.output.write(buf)
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.stdout().flush()
+    }
+}
\ No newline at end of file
diff --git a/src/manager/manager.rs b/src/manager/manager.rs
new file mode 100644
index 0000000..e9eb468
--- /dev/null
+++ b/src/manager/manager.rs
@@ -0,0 +1,45 @@
+use std::io::Write;
+
+use { Context, Terminal };
+use super::IScreenManager;
+use super::ansi_manager::AnsiScreenManager;
+
+pub struct ScreenManager
+{
+    screen_manager: Box<IScreenManager<Box<Write>>>
+}
+
+impl ScreenManager
+{
+    pub fn new() -> ScreenManager {
+        //        #[cfg(target_os = "windows")]
+        //        let cursor = functions::get_module::<Box<ITerminalCursor>>(WinApiCursor::new(), AnsiCursor::new());
+        //
+        //        #[cfg(not(target_os = "windows"))]
+
+        ScreenManager
+        {
+            screen_manager: Box::new(AnsiScreenManager::new()),
+        }
+    }
+
+    pub fn stdout(&mut self) -> &mut Box<Write>
+    {
+        self.screen_manager.stdout()
+    }
+
+    pub fn register_output(&mut self, output: Box<Write>, is_alternate_screen: bool)
+    {
+        self.screen_manager.register_output(output,is_alternate_screen);
+    }
+
+    pub fn write_ansi(&mut self, string: String)
+    {
+        self.screen_manager.write_ansi(string);
+    }
+
+    pub fn write_ansi_str(&mut self, string: &str)
+    {
+        self.screen_manager.write_ansi_str(string);
+    }
+}
\ No newline at end of file
diff --git a/src/manager/mod.rs b/src/manager/mod.rs
new file mode 100644
index 0000000..0c12f45
--- /dev/null
+++ b/src/manager/mod.rs
@@ -0,0 +1,21 @@
+pub mod manager;
+pub mod terminal;
+
+#[cfg(target_os = "windows")]
+mod win_manager;
+mod ansi_manager;
+
+#[cfg(target_os = "windows")]
+use self::win_manager::WinApiScreenManager;
+use self::ansi_manager::AnsiScreenManager;
+
+use { Context, Terminal };
+pub use self::manager::{ ScreenManager };
+
+pub trait IScreenManager<Output>
+{
+    fn stdout(&mut self) -> &mut Output;
+    fn register_output(&mut self, output: Output, is_alternate_screen: bool);
+    fn write_ansi(&mut self, string: String);
+    fn write_ansi_str(&mut self, string: &str);
+}
\ No newline at end of file
diff --git a/src/manager/terminal.rs b/src/manager/terminal.rs
new file mode 100644
index 0000000..21e39d0
--- /dev/null
+++ b/src/manager/terminal.rs
@@ -0,0 +1,86 @@
+use std::io::Write;
+use std::io;
+use std::sync::Mutex;
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use { Context };
+use super::super::manager::ScreenManager;
+
+use super::super::terminal;
+use super::super::cursor;
+use super::super::style;
+
+use std::fmt;
+
+pub struct Terminal
+{
+    pub screen_manager: Rc<Mutex<ScreenManager>>,
+    context: Context
+}
+
+impl Terminal
+{
+    pub fn new() -> Terminal
+    {
+        Terminal {
+            screen_manager: Rc::new(Mutex::new(ScreenManager::new())),
+            context: Context::new()
+        }
+    }
+
+    /// Get an TerminalColor implementation whereon color related actions can be performed.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// extern crate crossterm;
+    ///
+    /// use self::crossterm::style::{color, Color};
+    ///
+    /// // Get colored terminal instance
+    /// let mut colored_terminal = color();
+    ///
+    /// // preform some actions on the colored terminal
+    /// colored_terminal.set_fg(Color::Red);
+    /// colored_terminal.set_bg(Color::Blue);
+    /// colored_terminal.reset();
+    /// ```
+    pub fn color(&self) -> Box<style::TerminalColor> {
+        Box::from(style::TerminalColor::new(self.screen_manager.clone()))
+    }
+
+    /// Wraps an displayable object so it can be formatted with colors and attributes.
+    ///
+    /// Check `/examples/color` in the libary for more spesific examples.
+    ///
+    /// #Example
+    ///
+    /// ```rust
+    /// extern crate crossterm;
+    ///
+    /// use self::crossterm::style::{paint,Color};
+    ///
+    /// fn main()
+    /// {
+    ///     // Create an styledobject object from the text 'Unstyled font'
+    ///     // Currently it has the default foregroundcolor and backgroundcolor.
+    ///     println!("{}",paint("Unstyled font"));
+    ///
+    ///     // Create an displayable object from the text 'Colored font',
+    ///     // Paint this with the `Red` foreground color and `Blue` backgroundcolor.
+    ///     // Print the result.
+    ///     let styledobject = paint("Colored font").with(Color::Red).on(Color::Blue);
+    ///     println!("{}", styledobject);
+    ///
+    ///     // Or all in one line
+    ///     println!("{}", paint("Colored font").with(Color::Red).on(Color::Blue));
+    /// }
+    /// ```
+    pub fn paint<D>(&self, val: D) -> style::StyledObject<D>
+        where
+            D: fmt::Display,
+    {
+        style::ObjectStyle::new().apply_to(val, self.screen_manager.clone())
+    }
+}
diff --git a/src/manager/win_manager.rs b/src/manager/win_manager.rs
new file mode 100644
index 0000000..b9c2645
--- /dev/null
+++ b/src/manager/win_manager.rs
@@ -0,0 +1,4 @@
+pub struct WinApiScreenManager
+{
+
+}
\ No newline at end of file
diff --git a/src/shared/functions.rs b/src/shared/functions.rs
index 31755aa..eeb5d61 100644
--- a/src/shared/functions.rs
+++ b/src/shared/functions.rs
@@ -1,9 +1,11 @@
 //! Some actions need to preformed platform independently since they can not be solved `ANSI escape codes`.
 
-use {Context};
+use std::sync::Mutex;
+use {Context, ScreenManager, Terminal};
 
 #[cfg(windows)]
 use kernel::windows_kernel::terminal::terminal_size;
+
 #[cfg(unix)]
 use kernel::unix_kernel::terminal::terminal_size;
 
@@ -19,9 +21,13 @@ pub fn get_terminal_size() -> (u16, u16)
 }
 
 /// Get the cursor position based on the current platform.
-pub fn get_cursor_position() -> (u16,u16)
+pub fn get_cursor_position(screen: &Terminal) -> (u16,u16)
 {
-   pos()
+    #[cfg(unix)]
+    return pos(&screen);
+
+    #[cfg(windows)]
+    return pos();
 }
 
 #[cfg(windows)]
@@ -38,7 +44,6 @@ pub fn get_module<T>(winapi_impl: T, unix_impl: T) -> Option<T>
         // Try to enable ansi on windows if not than use WINAPI.
         does_support = try_enable_ansi_support();
 
-//        println!("does support = {}", does_support);
         if !does_support
         {
             term = Some(winapi_impl);
diff --git a/src/shared/traits.rs b/src/shared/traits.rs
index 44437b0..843280a 100644
--- a/src/shared/traits.rs
+++ b/src/shared/traits.rs
@@ -1,11 +1,11 @@
+
 /// This trait is used for creating an instance of an concrete implementation from an base trait.
 /// This trait allows the output to be different in size.
-pub trait Construct {
+pub trait Construct{
     fn new() -> Box<Self>
-    where
-        Self: Sized;
+        where
+            Self: Sized;
 }
-
 /// This trait can be used to create an empty instance of an struct.
 pub trait Empty {
     fn empty() -> Self;
diff --git a/src/state/commands/mod.rs b/src/state/commands/mod.rs
index a72ef73..008c009 100644
--- a/src/state/commands/mod.rs
+++ b/src/state/commands/mod.rs
@@ -24,23 +24,24 @@ pub use self::unix_command::*;
 #[cfg(windows)]
 pub use self::win_commands::*;
 
-use super::Context;
+use { Context, Terminal };
 
 /// This command can be used for simple commands witch just have an `undo()` and an `execute()`
 pub trait ICommand
 {
     fn new() -> Box<Self> where Self: Sized;
-    fn execute(&mut self) -> bool;
-    fn undo(&mut self) -> bool;
+    fn execute(&mut self, terminal: &Terminal) -> bool;
+    fn undo(&mut self, terminal: &Terminal) -> bool;
 }
 
 /// This command is used for complex commands whits change the terminal state.
 /// By passing an `Context` instance this command will register it self to notify the terminal state change.
+
 pub trait IContextCommand
 {
     fn new(context: &mut Context) -> (Box<Self>, i16) where Self: Sized;
-    fn execute(&mut self) -> bool;
-    fn undo(&mut self) -> bool;
+    fn execute(&mut self, terminal: &Terminal) -> bool;
+    fn undo(&mut self, terminal: &Terminal) -> bool;
 }
 
 /// This generates an random key for the `ContextCommand`.
diff --git a/src/state/commands/shared_commands.rs b/src/state/commands/shared_commands.rs
index 81826f6..1d341b5 100644
--- a/src/state/commands/shared_commands.rs
+++ b/src/state/commands/shared_commands.rs
@@ -1,6 +1,6 @@
 //! This module contains the commands that can be used for both unix and windows systems.
-
-use super::ICommand;
+use { Context, Terminal };
+use super::{ ICommand, IContextCommand };
 use std::io;
 use std::io::Write;
 
@@ -11,26 +11,24 @@ pub struct ToAlternateScreenBufferCommand;
 impl ICommand for ToAlternateScreenBufferCommand
 {
     fn new() -> Box<ToAlternateScreenBufferCommand> {
-        Box::from(ToAlternateScreenBufferCommand { })
+        Box::from(ToAlternateScreenBufferCommand {})
     }
 
-    fn execute(&mut self) -> bool
+    fn execute(&mut self, terminal: &Terminal) -> bool
     {
-        let mut some_writer = io::stdout();
-        match write!(some_writer, csi!("?1049h"))
+        let mut screen = terminal.screen_manager.lock().unwrap();
         {
-            Ok(_) => true,
-            Err(_) => false
+            screen.write_ansi_str(csi!("?1049h"));
+            return true;
         }
     }
 
-    fn undo(&mut self) -> bool
+    fn undo(&mut self, terminal: &Terminal) -> bool
     {
-        let mut some_writer = io::stdout();
-        match write!(some_writer, csi!("?1049l"))
+        let mut screen = terminal.screen_manager.lock().unwrap();
         {
-            Ok(_) => true,
-            Err(_) => false
+            screen.write_ansi_str(csi!("?1049l"));
+            return true;
         }
     }
 }
\ No newline at end of file
diff --git a/src/state/commands/unix_command.rs b/src/state/commands/unix_command.rs
index 37510a9..68ec2e3 100644
--- a/src/state/commands/unix_command.rs
+++ b/src/state/commands/unix_command.rs
@@ -1,6 +1,6 @@
 //! This module contains the commands that can be used for unix systems.
 
-use Context;
+use {Terminal, Context};
 use super::IContextCommand;
 use kernel::unix_kernel::terminal;
 use termios::{Termios, tcsetattr, TCSAFLUSH, ICANON, ECHO, CREAD};
@@ -23,7 +23,7 @@ impl IContextCommand for NoncanonicalModeCommand
         (Box::from(command),key)
     }
 
-    fn execute(&mut self) -> bool
+    fn execute(&mut self, terminal: &Terminal) -> bool
     {
         // Set noncanonical mode
         if let Ok(orig) = Termios::from_fd(FD_STDIN)
@@ -42,7 +42,7 @@ impl IContextCommand for NoncanonicalModeCommand
         }
     }
 
-    fn undo(&mut self) -> bool
+    fn undo(&mut self, terminal: &Terminal) -> bool
     {
         // Disable noncanonical mode
         if let Ok(orig) = Termios::from_fd(FD_STDIN)
@@ -80,7 +80,7 @@ impl IContextCommand for EnableRawModeCommand
         (Box::from(command),key)
     }
 
-    fn execute(&mut self) -> bool
+    fn execute(&mut self, terminal: &Terminal) -> bool
     {
         if let Ok(original_mode) = terminal::get_terminal_mode()
         {
@@ -95,7 +95,7 @@ impl IContextCommand for EnableRawModeCommand
         }
     }
 
-    fn undo(&mut self) -> bool
+    fn undo(&mut self, terminal: &Terminal) -> bool
     {
         if let Ok(original_mode) = terminal::get_terminal_mode()
         {
diff --git a/src/state/commands/win_commands.rs b/src/state/commands/win_commands.rs
index 510b893..f28ab42 100644
--- a/src/state/commands/win_commands.rs
+++ b/src/state/commands/win_commands.rs
@@ -97,7 +97,7 @@ impl IContextCommand for EnableRawModeCommand
         (Box::from(command),key)
     }
 
-    fn execute(&mut self) -> bool
+    fn execute(&mut self, terminal: &Terminal) -> bool
     {
         use self::wincon::{ENABLE_LINE_INPUT,ENABLE_PROCESSED_INPUT, ENABLE_ECHO_INPUT};
 
@@ -119,7 +119,7 @@ impl IContextCommand for EnableRawModeCommand
         true
     }
 
-    fn undo(&mut self) -> bool
+    fn undo(&mut self, terminal: &Terminal) -> bool
     {
         let output_handle = kernel::get_output_handle();
 
@@ -152,7 +152,7 @@ impl ICommand for ToAlternateScreenBufferCommand
         Box::from(ToAlternateScreenBufferCommand {})
     }
 
-    fn execute(&mut self) -> bool
+    fn execute(&mut self, context: &Context) -> bool
     {
         let mut chi_buffer: [CHAR_INFO;160] = unsafe {mem::zeroed() };
 
@@ -206,7 +206,7 @@ impl ICommand for ToAlternateScreenBufferCommand
         true
     }
 
-    fn undo(&mut self) -> bool
+    fn undo(&mut self, context: &Context) -> bool
     {
         let handle = kernel::get_output_handle();
         kernel::set_active_screen_buffer(handle);
diff --git a/src/state/context.rs b/src/state/context.rs
index dcd6dff..8329967 100644
--- a/src/state/context.rs
+++ b/src/state/context.rs
@@ -2,12 +2,16 @@
 
 use std::ops::Drop;
 use std::collections::HashMap;
-use super::commands::IContextCommand;
+use std::io::Write;
+use std::sync::Mutex;
+
+use super::commands::{ ICommand, IContextCommand};
+use super::super::manager::ScreenManager;
 
 /// Struct that stores the changed states of the terminal.
 pub struct Context
 {
-    changed_states:  HashMap<i16, (Box<IContextCommand>) >,
+    changed_states: HashMap<i16, Box<IContextCommand>>,
 }
 
 impl Context
@@ -15,17 +19,27 @@ impl Context
     /// Create new Context where the terminals states can be handled.
     pub fn new() -> Context
     {
-        println!("Context has been created");
-        Context { changed_states: HashMap::new() }
+        Context {
+            changed_states: HashMap::new(),
+        }
     }
 
     /// Restore all changes that are made to the terminal.
     pub fn restore_changes(&mut self)
     {
-        for (x, state) in self.changed_states.iter_mut()
-        {
-            state.undo();
-        }
+//        use std::iter::FromIterator;
+//
+//        let mut buffer = Vec::new();
+//
+//        for i in 0..self.changed_states.len()
+//        {
+//            buffer[i] = self.changed_states.iter().nth(i).unwrap();
+//        }
+//
+//        for i in 0..buffer.len()
+//        {
+//            buffer[i].1.undo(self);
+//        }
     }
 
     /// Register new changed state with the given key.
diff --git a/src/style/color/ansi_color.rs b/src/style/color/ansi_color.rs
index a372b39..545c269 100644
--- a/src/style/color/ansi_color.rs
+++ b/src/style/color/ansi_color.rs
@@ -1,11 +1,13 @@
 //! This is an ANSI specific implementation for styling related action.
 //! This module is used for windows 10 terminals and unix terminals by default.
 
-use Construct;
+use { Construct, Terminal, ScreenManager };
 use super::ITerminalColor;
 use super::super::{Color, ColorType};
 
 use std::io::{self, Write};
+use std::rc::Rc;
+use std::sync::Mutex;
 
 /// This struct is an ansi implementation for color related actions.
 #[derive(Debug)]
@@ -18,19 +20,26 @@ impl Construct for AnsiColor {
 }
 
 impl ITerminalColor for AnsiColor {
-    fn set_fg(&self, fg_color: Color) {
-            let mut some_writer = io::stdout();
-            write!(&mut some_writer, csi!("{}m"), self.color_value(fg_color, ColorType::Foreground));
+    fn set_fg(&self, fg_color: Color, screen_manager: Rc<Mutex<ScreenManager>>) {
+
+        let mut screen = screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("{}m"),self.color_value(fg_color, ColorType::Foreground)));
+        }
     }
 
-    fn set_bg(&self, bg_color: Color) {
-            let mut some_writer = io::stdout();
-            write!(&mut some_writer, csi!("{}m"), self.color_value(bg_color, ColorType::Background));
+    fn set_bg(&self, bg_color: Color, screen_manager: Rc<Mutex<ScreenManager>>) {
+        let mut screen = screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("{}m"),self.color_value(bg_color, ColorType::Background)));
+        }
     }
 
-    fn reset(&self) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("0m"));
+    fn reset(&self, screen_manager: Rc<Mutex<ScreenManager>>) {
+        let mut screen = screen_manager.lock().unwrap();
+        {
+            screen.write_ansi_str(csi!("0m"));
+        }
     }
 
     fn color_value(&self, color: Color, color_type: ColorType) -> String {
diff --git a/src/style/color/color.rs b/src/style/color/color.rs
index 45ffc2f..083d34e 100644
--- a/src/style/color/color.rs
+++ b/src/style/color/color.rs
@@ -3,27 +3,30 @@
 
 use super::*;
 use shared::functions;
-use { Construct, Context };
+use { Construct, Context, Terminal };
 use style::{Color, ObjectStyle, StyledObject};
 
 use std::ops::Drop;
 use std::{ fmt, io };
+use std::rc::Rc;
+use std::sync::Mutex;
 
 /// Struct that stores an specific platform implementation for color related actions.
 pub struct TerminalColor {
-    terminal_color: Option<Box<ITerminalColor>>,
+    color: Option<Box<ITerminalColor>>,
+    screen_manager: Rc<Mutex<ScreenManager>>
 }
 
 impl TerminalColor {
     /// Create new instance whereon color related actions can be performed.
-    pub fn new() -> TerminalColor {
+    pub fn new(screen_manager: Rc<Mutex<ScreenManager>> ) -> TerminalColor {
         #[cfg(target_os = "windows")]
         let color = functions::get_module::<Box<ITerminalColor>>(WinApiColor::new(), AnsiColor::new());
 
         #[cfg(not(target_os = "windows"))]
         let color = Some(AnsiColor::new() as Box<ITerminalColor>);
 
-        TerminalColor { terminal_color: color }
+        TerminalColor { color: color, screen_manager: screen_manager.clone() }
     }
 
     /// Set the foreground color to the given color.
@@ -45,8 +48,8 @@ impl TerminalColor {
     ///
     /// ```
     pub fn set_fg(&mut self, color: Color) {
-        if let Some(ref terminal_color) = self.terminal_color {
-            terminal_color.set_fg(color);
+        if let Some(ref terminal_color) = self.color {
+            terminal_color.set_fg(color, self.screen_manager.clone());
         }
     }
 
@@ -70,8 +73,8 @@ impl TerminalColor {
     ///
     /// ```
     pub fn set_bg(&mut self, color: Color) {
-        if let Some(ref terminal_color) = self.terminal_color {
-            terminal_color.set_bg(color);
+        if let Some(ref terminal_color) = self.color {
+            terminal_color.set_bg(color, self.screen_manager.clone());
         }
     }
 
@@ -90,8 +93,8 @@ impl TerminalColor {
     ///
     /// ```
     pub fn reset(&mut self) {
-        if let Some(ref terminal_color) = self.terminal_color {
-            terminal_color.reset();
+        if let Some(ref terminal_color) = self.color {
+            terminal_color.reset(self.screen_manager.clone());
         }
     }
 
@@ -113,59 +116,6 @@ impl TerminalColor {
     }
 }
 
-/// Get an TerminalColor implementation whereon color related actions can be performed.
-///
-/// # Example
-///
-/// ```rust
-/// extern crate crossterm;
-///
-/// use self::crossterm::style::{color, Color};
-/// 
-/// // Get colored terminal instance
-/// let mut colored_terminal = color();
-///
-/// // preform some actions on the colored terminal
-/// colored_terminal.set_fg(Color::Red);
-/// colored_terminal.set_bg(Color::Blue);
-/// colored_terminal.reset();
-/// ```
-pub fn color() -> Box<TerminalColor> {
-    Box::from(TerminalColor::new())
+pub fn color(screen_manager: Rc<Mutex<ScreenManager>>) -> Box<TerminalColor> {
+    Box::from(TerminalColor::new(screen_manager.clone()))
 }
-
-/// Wraps an displayable object so it can be formatted with colors and attributes.
-///
-/// Check `/examples/color` in the libary for more spesific examples.
-/// 
-/// #Example
-///
-/// ```rust
-/// extern crate crossterm;
-///
-/// use self::crossterm::style::{paint,Color};
-///
-/// fn main()
-/// {
-///     // Create an styledobject object from the text 'Unstyled font' 
-///     // Currently it has the default foregroundcolor and backgroundcolor.
-///     println!("{}",paint("Unstyled font"));
-///
-///     // Create an displayable object from the text 'Colored font', 
-///     // Paint this with the `Red` foreground color and `Blue` backgroundcolor.
-///     // Print the result.
-///     let styledobject = paint("Colored font").with(Color::Red).on(Color::Blue);
-///     println!("{}", styledobject);
-///    
-///     // Or all in one line
-///     println!("{}", paint("Colored font").with(Color::Red).on(Color::Blue));
-/// }
-/// ```
-pub fn paint<D>(val: D) -> StyledObject<D>
-where
-    D: fmt::Display,
-{
-    ObjectStyle::new().apply_to(val)
-}
-
-
diff --git a/src/style/color/mod.rs b/src/style/color/mod.rs
index 8ffcf36..7e20bc7 100644
--- a/src/style/color/mod.rs
+++ b/src/style/color/mod.rs
@@ -9,6 +9,11 @@ use self::winapi_color::WinApiColor;
 use self::ansi_color::AnsiColor;
 use super::{Color, ColorType};
 
+use std::rc::Rc;
+use std::sync::Mutex;
+
+use { Terminal, ScreenManager };
+
 ///! This trait defines the actions that can be preformed with the terminal color.
 ///! This trait can be implemented so that an concrete implementation of the ITerminalColor can forfill
 ///! the wishes to work on an specific platform.
@@ -19,11 +24,11 @@ use super::{Color, ColorType};
 ///! so that color related actions can be preformed on both unix and windows systems.
 pub trait ITerminalColor {
     /// Set the foreground color to the given color.
-    fn set_fg(&self, fg_color: Color);
+    fn set_fg(&self, fg_color: Color, screen_manager: Rc<Mutex<ScreenManager>>);
     /// Set the background color to the given color.
-    fn set_bg(&self, fg_color: Color);
+    fn set_bg(&self, fg_color: Color, screen_manager: Rc<Mutex<ScreenManager>>);
     /// Reset the terminal color to default.
-    fn reset(&self);
+    fn reset(&self,screen_manager: Rc<Mutex<ScreenManager>>);
     /// Gets an value that represents an color from the given `Color` and `ColorType`.
     fn color_value(&self, color: Color, color_type: ColorType) -> String;
 }
\ No newline at end of file
diff --git a/src/style/mod.rs b/src/style/mod.rs
index 31fadd4..8304ef6 100644
--- a/src/style/mod.rs
+++ b/src/style/mod.rs
@@ -4,7 +4,7 @@
 mod color;
 mod styles;
 
-pub use self::color::color::{color, paint, TerminalColor };
+pub use self::color::color::{color, TerminalColor };
 
 pub use self::styles::objectstyle::ObjectStyle;
 pub use self::styles::styledobject::StyledObject;
diff --git a/src/style/styles/objectstyle.rs b/src/style/styles/objectstyle.rs
index 3d6df81..49dc3f7 100644
--- a/src/style/styles/objectstyle.rs
+++ b/src/style/styles/objectstyle.rs
@@ -2,7 +2,9 @@
 
 use std::fmt::Display;
 use style::{Color, StyledObject};
-
+use { Terminal, ScreenManager };
+use std::sync::Mutex;
+use std::rc::Rc;
 #[cfg(unix)]
 use super::super::Attribute;
 
@@ -29,12 +31,13 @@ impl Default for ObjectStyle {
 
 impl ObjectStyle {
     /// Apply an `StyledObject` to the passed displayable object.
-    pub fn apply_to<D>(&self, val: D) -> StyledObject<D>
+    pub fn apply_to<D>(&self, val: D, screen: Rc<Mutex<ScreenManager>>) -> StyledObject<D>
     where
         D: Display,
     {
         StyledObject {
             object_style: self.clone(),
+            screen_manager: screen,
             content: val,
         }
     }
diff --git a/src/style/styles/styledobject.rs b/src/style/styles/styledobject.rs
index 11aab45..0703556 100644
--- a/src/style/styles/styledobject.rs
+++ b/src/style/styles/styledobject.rs
@@ -2,6 +2,9 @@
 
 use std::{ self, fmt };
 use std::io::Write;
+use std::sync::Mutex;
+use std::rc::Rc;
+use { Terminal, ScreenManager };
 
 #[cfg(unix)]
 use super::super::Attribute;
@@ -12,6 +15,7 @@ use style::{Color, ObjectStyle};
 pub struct StyledObject<D> {
     pub object_style: ObjectStyle,
     pub content: D,
+    pub screen_manager: Rc<Mutex<ScreenManager>>
 }
 
 impl<D> StyledObject<D> {
@@ -112,7 +116,7 @@ macro_rules! impl_fmt
         impl<D: fmt::$name> fmt::$name for StyledObject<D> {
             fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result
             {
-                let mut colored_terminal = super::super::color();
+                let mut colored_terminal = super::super::color(self.screen_manager.clone());
                 let mut reset = true;
 
                 if let Some(bg) = self.object_style.bg_color
@@ -133,7 +137,12 @@ macro_rules! impl_fmt
                  }
 
                 fmt::$name::fmt(&self.content, f)?;
-                std::io::stdout().flush().expect("Flush stdout failed");
+
+                let mut mutex = &self.screen_manager;
+                {
+                    let mut screen = mutex.lock().unwrap();
+                     screen.stdout().flush().expect("Flush stdout failed");
+                }
 
                 if reset
                 {
diff --git a/src/terminal/ansi_terminal.rs b/src/terminal/ansi_terminal.rs
index 0b7b7b9..ec72d4a 100644
--- a/src/terminal/ansi_terminal.rs
+++ b/src/terminal/ansi_terminal.rs
@@ -1,15 +1,19 @@
 //! This is an `ANSI escape code` specific implementation for terminal related action.
 //! This module is used for windows 10 terminals and unix terminals by default.
 
-use Construct;
+use {Construct, Terminal};
 use shared::functions;
 use super::{ClearType, ITerminal};
 
 use std::io;
 use std::io::Write;
+use std::sync::Mutex;
+use std::cell::RefCell;
+
+use ScreenManager;
 
 /// This struct is an ansi implementation for terminal related actions.
-pub struct AnsiTerminal  ;
+pub struct AnsiTerminal;
 
 impl Construct for AnsiTerminal {
     fn new() -> Box<AnsiTerminal> {
@@ -18,43 +22,54 @@ impl Construct for AnsiTerminal {
 }
 
 impl ITerminal for AnsiTerminal {
-    fn clear(&self, clear_type: ClearType) {
-        let mut some_writer = io::stdout();
-        match clear_type {
-            ClearType::All => {                
-                write!(&mut some_writer, csi!("2J"));
-            },
-            ClearType::FromCursorDown=> {
-                write!(&mut some_writer, csi!("J"));
-            },
-            ClearType::FromCursorUp => {
-                write!(&mut some_writer, csi!("1J"));
-            },
-            ClearType::CurrentLine => {
-                write!(&mut some_writer, csi!("2K"));
-            },
-            ClearType::UntilNewLine => {
-                write!(&mut some_writer, csi!("K"));
-            },
-        };
+    fn clear(&self, clear_type: ClearType, terminal: &Terminal) {
+
+        let mut screen_manager = terminal.screen_manager.lock().unwrap();
+        {
+            let mut stdout = screen_manager.stdout();
+
+            match clear_type {
+                ClearType::All => {
+                    write!(stdout, csi!("2J"));
+                },
+                ClearType::FromCursorDown => {
+                    write!(stdout, csi!("J"));
+                },
+                ClearType::FromCursorUp => {
+                    write!(stdout, csi!("1J"));
+                },
+                ClearType::CurrentLine => {
+                    write!(stdout, csi!("2K"));
+                },
+                ClearType::UntilNewLine => {
+                    write!(stdout, csi!("K"));
+                },
+            };
+        }
     }
 
-    fn terminal_size(&self) -> (u16, u16) {
+    fn terminal_size(&self, terminal: &Terminal) -> (u16, u16) {
         functions::get_terminal_size()
     }
 
-    fn scroll_up(&self, count: i16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}S"), count);
+    fn scroll_up(&self, count: i16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("{}S"), count));
+        }
     }
 
-    fn scroll_down(&self, count: i16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("{}T"), count);
+    fn scroll_down(&self, count: i16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("{}T"), count));
+        }
     }
 
-    fn set_size(&self, width: i16, height: i16) {
-        let mut some_writer = io::stdout();
-        write!(&mut some_writer, csi!("8;{};{}t"), width, height);
+    fn set_size(&self, width: i16, height: i16, terminal: &Terminal) {
+        let mut screen = terminal.screen_manager.lock().unwrap();
+        {
+            screen.write_ansi(format!(csi!("8;{};{}t"), width, height));
+        }
     }
 }
diff --git a/src/terminal/mod.rs b/src/terminal/mod.rs
index 99e4e75..2e5c74e 100644
--- a/src/terminal/mod.rs
+++ b/src/terminal/mod.rs
@@ -5,21 +5,23 @@
 //! - raw mode
 //! - clearing resizing scrolling the terminal.
 
-mod terminal;
+use {Context, ScreenManager, Terminal};
+use self::ansi_terminal::AnsiTerminal;
+pub use self::terminal::{ terminal};
+#[cfg(target_os = "windows")]
+use self::winapi_terminal::WinApiTerminal;
+use std::cell::RefCell;
+use std::sync::Mutex;
+
+pub mod terminal;
 
 #[cfg(target_os = "windows")]
 mod winapi_terminal;
 mod ansi_terminal;
 
-mod screen;
+pub mod screen;
 mod raw;
 
-#[cfg(target_os = "windows")]
-use self::winapi_terminal::WinApiTerminal;
-use self::ansi_terminal::AnsiTerminal;
-
-pub use self::terminal::{ Terminal, terminal};
-
 /// Enum that can be used for the kind of clearing that can be done in the terminal.
 pub enum ClearType {
     All,
@@ -39,13 +41,13 @@ pub enum ClearType {
 ///! so that cursor related actions can be preformed on both unix and windows systems.
 pub trait ITerminal {
     /// Clear the current cursor by specifying the clear type
-    fn clear(&self, clear_type: ClearType);
+    fn clear(&self, clear_type: ClearType, terminal: &Terminal);
     /// Get the terminal size (x,y)
-    fn terminal_size(&self) -> (u16, u16);
+    fn terminal_size(&self, terminal: &Terminal) -> (u16, u16);
     /// Scroll `n` lines up in the current terminal.
-    fn scroll_up(&self, count: i16);
+    fn scroll_up(&self, count: i16, terminal: &Terminal);
     /// Scroll `n` lines down in the current terminal.
-    fn scroll_down(&self, count: i16);
+    fn scroll_down(&self, count: i16, terminal: &Terminal);
     /// Resize terminal to the given width and height.
-    fn set_size(&self,width: i16, height: i16);
+    fn set_size(&self,width: i16, height: i16, terminal: &Terminal);
 }
diff --git a/src/terminal/raw.rs b/src/terminal/raw.rs
index 48daba8..1742425 100644
--- a/src/terminal/raw.rs
+++ b/src/terminal/raw.rs
@@ -1,82 +1,82 @@
-//! This module is used for enabling and disabling raw mode for the terminal.
-//!
-//! What exactly is raw state:
-//! - No line buffering.
-//!    Normally the terminals uses line buffering. This means that the input will be send to the terminal line by line.
-//!    With raw mode the input will be send one byte at a time.
-//! - Input
-//!   All input has to be written manually by the programmer.
-//! - Characters
-//!   The characters are not processed by the terminal driver, but are sent straight through.
-//!   Special character have no meaning, like backspace will not be interpret as backspace but instead will be directly send to the terminal.
-//!
-//! With these modes you can easier design the terminal screen.
-//!
-//! # Example
-//!
-//! ```rust
-//! to be implemented
-//!
-//! ```
-
-#[cfg(not(windows))]
-use state::commands::unix_command::EnableRawModeCommand;
-#[cfg(windows)]
-use state::commands::win_commands::EnableRawModeCommand;
-
-use Context;
-use state::commands::IContextCommand;
-
-use std::io::{ self, Write};
-
-/// A wrapper for the raw terminal state. Which can be used to write to.
-pub struct RawTerminal<'a, W: Write>
-{
-    output: W,
-    context : &'a mut Context
-}
-
-/// Trait withs contains a method for switching into raw mode.
-pub trait IntoRawMode: Write + Sized
-{
-    fn into_raw_mode<'a>(self, context: &'a mut Context) -> io::Result<RawTerminal<Self>>;
-}
-
-impl<W: Write> IntoRawMode for W
-{
-    /// Switch to raw mode.
-    ///
-    /// Raw mode means that input (stdin) won't be printed it will instead have to be written manually by
-    /// the program. The input isn't canonicalised or line buffered (that is, you can
-    /// read from input(stdin) one byte of a time).
-    fn into_raw_mode<'a>(self, context: &'a mut Context) -> io::Result<RawTerminal<Self>>
-    {
-        let (mut command, _) = EnableRawModeCommand::new(context);
-        let success = command.execute();
-
-        if success
-        {
-            Ok(RawTerminal { output: self, context: context})
-
-        }else { panic!("cannot move into raw mode") }
-    }
-}
-
-impl<'a, W: Write> Write for RawTerminal<'a, W> {
-    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.output.write(buf)
-    }
-
-    fn flush(&mut self) -> io::Result<()> {
-        self.output.flush()
-    }
-}
-
-/// If an instance of `RawTerminal` will be dropped all terminal changes that are made will be undone.
-impl <'a, W: Write> Drop for RawTerminal<'a, W>
-{
-    fn drop(&mut self)
-    {
-        self.context.restore_changes();
-    }
-}
\ No newline at end of file
+////! This module is used for enabling and disabling raw mode for the terminal.
+////!
+////! What exactly is raw state:
+////! - No line buffering.
+////!    Normally the terminals uses line buffering. This means that the input will be send to the terminal line by line.
+////!    With raw mode the input will be send one byte at a time.
+////! - Input
+////!   All input has to be written manually by the programmer.
+////! - Characters
+////!   The characters are not processed by the terminal driver, but are sent straight through.
+////!   Special character have no meaning, like backspace will not be interpret as backspace but instead will be directly send to the terminal.
+////!
+////! With these modes you can easier design the terminal screen.
+////!
+////! # Example
+////!
+////! ```rust
+////! to be implemented
+////!
+////! ```
+//
+//#[cfg(not(windows))]
+//use state::commands::unix_command::EnableRawModeCommand;
+//#[cfg(windows)]
+//use state::commands::win_commands::EnableRawModeCommand;
+//
+//use Context;
+//use state::commands::IContextCommand;
+//
+//use std::io::{ self, Write};
+//
+///// A wrapper for the raw terminal state. Which can be used to write to.
+//pub struct RawTerminal<'a, W: Write>
+//{
+//    output: W,
+//    context : &'a mut Context
+//}
+//
+///// Trait withs contains a method for switching into raw mode.
+//pub trait IntoRawMode: Write + Sized
+//{
+//    fn into_raw_mode<'a>(self, context: &'a mut Context) -> io::Result<RawTerminal<Self>>;
+//}
+//
+//impl<W: Write> IntoRawMode for W
+//{
+//    /// Switch to raw mode.
+//    ///
+//    /// Raw mode means that input (stdin) won't be printed it will instead have to be written manually by
+//    /// the program. The input isn't canonicalised or line buffered (that is, you can
+//    /// read from input(stdin) one byte of a time).
+//    fn into_raw_mode<'a>(self, context: &'a mut Context) -> io::Result<RawTerminal<Self>>
+//    {
+//        let (mut command, _) = EnableRawModeCommand::new(context);
+//        let success = command.execute(&context);
+//
+//        if success
+//        {
+//            Ok(RawTerminal { output: self, context: context})
+//
+//        }else { panic!("cannot move into raw mode") }
+//    }
+//}
+//
+//impl<'a, W: Write> Write for RawTerminal<'a, W> {
+//    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
+//        self.output.write(buf)
+//    }
+//
+//    fn flush(&mut self) -> io::Result<()> {
+//        self.output.flush()
+//    }
+//}
+//
+///// If an instance of `RawTerminal` will be dropped all terminal changes that are made will be undone.
+//impl <'a, W: Write> Drop for RawTerminal<'a, W>
+//{
+//    fn drop(&mut self)
+//    {
+//        self.context.restore_changes();
+//    }
+//}
\ No newline at end of file
diff --git a/src/terminal/screen.rs b/src/terminal/screen.rs
index ad6989b..e4f3878 100644
--- a/src/terminal/screen.rs
+++ b/src/terminal/screen.rs
@@ -1,32 +1,32 @@
 //! This module contains all the logic for switching between alternate screen and main screen.
 
 use shared::functions;
-use Context;
+use { Context, Terminal };
 use state::commands::*;
 
 use std::{ fmt, ops };
 use std::io::{self, Write};
 
-pub struct ToMainScreen;
-
-impl fmt::Display for ToMainScreen
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        get_to_alternate_screen_command().undo();
-        Ok(())
-    }
-}
-
-/// Struct that switches to alternate screen buffer on display.
-pub struct ToAlternateScreen;
-
-impl fmt::Display for ToAlternateScreen
-{
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        get_to_alternate_screen_command().execute();
-        Ok(())
-    }
-}
+//pub struct ToMainScreen;
+//
+//impl fmt::Display for ToMainScreen
+//{
+//    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+//        get_to_alternate_screen_command().undo();
+//        Ok(())
+//    }
+//}
+//
+///// Struct that switches to alternate screen buffer on display.
+//pub struct ToAlternateScreen;
+//
+//impl fmt::Display for ToAlternateScreen
+//{
+//    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+//        get_to_alternate_screen_command().execute();
+//        Ok(())
+//    }
+//}
 
 /// Struct that can be used for writing to an alternate screen.
 ///
@@ -51,52 +51,57 @@ impl fmt::Display for ToAlternateScreen
 ///    ...
 ///
 /// ```
-pub struct AlternateScreen<W: Write> {
-    /// The output target.
-    output: W,
-    context: Context
+pub struct AlternateScreen<'term> {
+    term: &'term Terminal
 }
 
-impl<W: Write>  AlternateScreen<W> {
-    pub fn from(mut output: W) -> Self {
-        write!(output, "{}", ToAlternateScreen);
-        AlternateScreen { output: output, context: Context::new()}
+impl<'term> AlternateScreen<'term> {
+    pub fn from(output: &'term Terminal) -> Self {
+        get_to_alternate_screen_command().execute(&output);
+//
+//        let mut screen = output.screen_manager.lock().unwrap();
+//        {
+//            screen.register_output(Box::from(o), true);
+//        }
+        AlternateScreen { term: output }
+    }
+
+    pub fn to_main(&self)
+    {
+        get_to_alternate_screen_command().undo(&self.term);
+    }
+
+    pub fn to_alternate(&self)
+    {
+        get_to_alternate_screen_command().execute(&self.term);
     }
 }
 
-impl<W: Write> ops::Deref for AlternateScreen<W> {
-    type Target = W;
-
-    fn deref(&self) -> &W {
-        &self.output
-    }
-}
-
-impl<W: Write> ops::DerefMut for AlternateScreen<W> {
-    fn deref_mut(&mut self) -> &mut W {
-        &mut self.output
-    }
-}
-
-impl<W: Write> Write for AlternateScreen<W> {
+impl<'term> Write for AlternateScreen<'term> {
     fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-        self.output.write(buf)
+        let mut screen = self.term.screen_manager.lock().unwrap();
+        {
+            screen.stdout().write(buf)
+        }
     }
 
     fn flush(&mut self) -> io::Result<()> {
-        self.output.flush()
+        let mut screen = self.term.screen_manager.lock().unwrap();
+        {
+            screen.stdout().flush()
+        }
     }
 }
 
-impl<W: Write> Drop for AlternateScreen<W>
+impl<'term> Drop for AlternateScreen<'term>
 {
     fn drop(&mut self)
     {
-        write!(self, "{}", ToMainScreen).expect("switch to main screen");
+        get_to_alternate_screen_command().undo(&self.term);
     }
 }
 
-/// Get the alternate screen command to enable and disable alternate screen based on the current platform
+// Get the alternate screen command to enable and disable alternate screen based on the current platform
 fn get_to_alternate_screen_command() -> Box<ICommand>
 {
     #[cfg(target_os = "windows")]
@@ -104,6 +109,6 @@ fn get_to_alternate_screen_command() -> Box<ICommand>
 
     #[cfg(not(target_os = "windows"))]
     let command = shared_commands::ToAlternateScreenBufferCommand::new();
-    
+
     command
 }
\ No newline at end of file
diff --git a/src/terminal/terminal.rs b/src/terminal/terminal.rs
index a32129f..9261d84 100644
--- a/src/terminal/terminal.rs
+++ b/src/terminal/terminal.rs
@@ -3,25 +3,28 @@
 
 use super::*;
 use shared::functions;
-use {Construct, Context};
+use { Construct, Context };
+use super::super::manager::terminal;
 
 use std::ops::Drop;
 
 /// Struct that stores an specific platform implementation for terminal related actions.
-pub struct Terminal {
+pub struct Terminal<'terminal> {
     terminal: Option<Box<ITerminal>>,
+    term: &'terminal terminal::Terminal
 }
 
-impl  Terminal {
+impl<'terminal>  Terminal<'terminal> {
     /// Create new terminal instance whereon terminal related actions can be performed.
-    pub fn new() -> Terminal {
+    pub fn new(term: &'terminal  terminal::Terminal) -> Terminal<'terminal> {
         #[cfg(target_os = "windows")]
         let terminal = functions::get_module::<Box<ITerminal>>(WinApiTerminal::new(), AnsiTerminal::new());
 
         #[cfg(not(target_os = "windows"))]
         let terminal = Some(AnsiTerminal::new() as Box<ITerminal>);
 
-        Terminal { terminal: terminal }
+        Terminal { terminal, term }
+
     }
 
     /// Clear the current cursor by specifying the clear type
@@ -49,7 +52,7 @@ impl  Terminal {
     /// ```
     pub fn clear(&mut self, clear_type: ClearType) {
         if let Some(ref terminal) = self.terminal {
-            terminal.clear(clear_type);
+            terminal.clear(clear_type, &self.term);
         }
     }
 
@@ -70,7 +73,7 @@ impl  Terminal {
     /// ```
     pub fn terminal_size(&mut self) -> (u16, u16) {
         if let Some(ref terminal) = self.terminal {
-            return terminal.terminal_size()
+            return terminal.terminal_size(&self.term)
         }
         (0,0)
     }
@@ -92,7 +95,7 @@ impl  Terminal {
     /// ```
     pub fn scroll_up(&mut self, count: i16) {
         if let Some(ref terminal) = self.terminal {
-            terminal.scroll_up(count);
+            terminal.scroll_up(count,&self.term);
         }
     }
 
@@ -113,7 +116,7 @@ impl  Terminal {
     /// ```
     pub fn scroll_down(&mut self, count: i16) {
         if let Some(ref terminal) = self.terminal {
-            terminal.scroll_down(count);
+            terminal.scroll_down(count, &self.term);
         }
     }
 
@@ -135,7 +138,7 @@ impl  Terminal {
     pub fn set_size(&mut self, width: i16, height: i16)
     {
         if let Some (ref terminal) = self.terminal {
-            terminal.set_size(width,height);
+            terminal.set_size(width,height,&self.term);
         }
     }
 }
@@ -158,7 +161,8 @@ impl  Terminal {
 ///
 /// ```
 ///
-pub fn terminal() -> Box<Terminal>
-{
-    Box::from(Terminal::new())
+///
+
+pub fn terminal<'terminal>(terminal: &'terminal terminal::Terminal) -> Box<Terminal<'terminal>> {
+    Box::from(Terminal::new(&terminal))
 }