diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 07d1c60..8631543 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -1,4 +1,3 @@
-
 /*****************************************************************************************
  Copyright (c) 2002-2004 The UbixOS Project
  All rights reserved.
@@ -45,6 +44,7 @@
 #include <devfs/devfs.h>
 #include <ubixfs/ubixfs.h>
 #include <isa/fdc.h>
+#include <ubixos/tty.h>
 
 typedef int (*intFunctionPTR)(void);
 
@@ -63,6 +63,7 @@
   devfs_init,
   ubixfs_init,
   fdc_init,
+  tty_init,
   };
 
 int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR);
@@ -71,6 +72,9 @@
 
 /***
  $Log$
+ Revision 1.26  2004/08/01 20:40:45  reddawg
+ Net related fixes
+
  Revision 1.25  2004/07/28 22:29:29  reddawg
  Turned off network support our scheduler... is really horible with cpu bound tasks the system does slow down to much
 
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index e9a92df..edf8a11 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -108,7 +108,6 @@
   kprintf("Free Pages: [%i]\n",systemVitals->freePages); 
   kprintf("MemoryMap:  [0x%X]\n",vmmMemoryMap);
   kprintf("Starting Os\n");
-  kpanic("bug fixens AHAHA JT TJ TJ TJ\n");
   irqEnable(0x0);
   sched();
   return(0x0);
@@ -116,6 +115,9 @@
 
 /***
  $Log$
+ Revision 1.66  2004/08/03 00:05:52  reddawg
+ com cvs comi comi cvs comiits sc sfix fb bug
+
  Revision 1.65  2004/07/29 21:32:16  reddawg
  My quick lunchs breaks worth of updates....
 
diff --git a/src/sys/isa/atkbd.c b/src/sys/isa/atkbd.c
index b036146..a89ef50 100644
--- a/src/sys/isa/atkbd.c
+++ b/src/sys/isa/atkbd.c
@@ -39,6 +39,7 @@
 #include <ubixos/sched.h>
 #include <ubixos/vitals.h>
 #include <ubixos/endtask.h>
+#include <ubixos/tty.h>
 
 static unsigned int keyMap = 0x0;
 static unsigned int ledStatus = 0x0;
@@ -107,11 +108,11 @@
 /*     */ {      0,      0,      0,      0,      0,      0,          0,         0},
 /*     */ {   0x20,      0,      0,      0,      0,      0,          0,         0},
 /*     */ {      0,      0,      0,      0,      0,      0,          0,         0},
-/* F1  */ { 0x3001,      0,      0, 0x3000,      0,      0,          0,         0},
-/*     */ { 0x3C00,      0,      0, 0x3001,      0,      0,          0,         0},
-/*     */ { 0x3D00,      0,      0, 0x3002,      0,      0,          0,         0},
-/*     */ { 0x3E00,      0,      0, 0x3003,      0,      0,          0,         0},
-/*     */ { 0x3F00,      0,      0, 0x3004,      0,      0,          0,         0},
+/* F1  */ { 0x3000,      0,      0, 0x3000,      0,      0,          0,         0},
+/*     */ { 0x3001,      0,      0, 0x3001,      0,      0,          0,         0},
+/*     */ { 0x3002,      0,      0, 0x3002,      0,      0,          0,         0},
+/*     */ { 0x3003,      0,      0, 0x3003,      0,      0,          0,         0},
+/*     */ { 0x3004,      0,      0, 0x3004,      0,      0,          0,         0},
 /*     */ { 0x4000,      0,      0,      0,      0,      0,          0,         0},
 /*     */ { 0x4100,      0,      0,      0,      0,      0,          0,         0},
 /*     */ { 0x4200,      0,      0,      0,      0,      0,          0,         0},
@@ -263,6 +264,7 @@
   else {
     switch ((keyboardMap[key][keyMap] >> 8)) {
       case 0x30:
+        tty_change(keyboardMap[key][keyMap] & 0xFF);
         //kprintf("Changing Consoles[0x%X:0x%X]\n",_current->id,_current);
         break;
       default:
@@ -299,6 +301,9 @@
 /***
 
  $Log$
+ Revision 1.18  2004/07/29 21:32:16  reddawg
+ My quick lunchs breaks worth of updates....
+
  Revision 1.17  2004/07/28 18:45:39  reddawg
  movement of files
 
diff --git a/src/sys/kernel/Makefile b/src/sys/kernel/Makefile
index 7ae9f6b..8124413 100644
--- a/src/sys/kernel/Makefile
+++ b/src/sys/kernel/Makefile
@@ -6,7 +6,7 @@
 include ../Makefile.inc
 
 #  Objects
-OBJS = sys_call.o endtask.o spinlock.o bioscall.o ld.o time.o fork.o syscall.o elf.o file.o systemtask.o exec.o sched.o kpanic.o vitals.o ubthread.o timer.o
+OBJS = tty.o sys_call.o endtask.o spinlock.o bioscall.o ld.o time.o fork.o syscall.o elf.o file.o systemtask.o exec.o sched.o kpanic.o vitals.o ubthread.o timer.o
 # ap-boot.o smp.o
 
 all: $(OBJS)
diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c
index a60eefe..f16971a 100644
--- a/src/sys/kernel/endtask.c
+++ b/src/sys/kernel/endtask.c
@@ -1,4 +1,4 @@
-	/*****************************************************************************************
+/*****************************************************************************************
  Copyright (c) 2002-2004 The UbixOS Project
  All rights reserved.
 
@@ -54,6 +54,12 @@
 
 /***
  $Log$
+ Revision 1.11  2004/07/28 15:05:43  reddawg
+ Major:
+   Pages now have strict security enforcement.
+   Many null dereferences have been resolved.
+   When apps loaded permissions set for pages rw and ro
+
  Revision 1.10  2004/07/24 23:04:44  reddawg
  Changes... mark let me know if you fault at pid 185 when you type stress