diff --git a/src/bin/Makefile b/src/bin/Makefile
index c35c796..4593701 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 # The System Makefile (C) 2002 The UbixOS Project
 
-all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin
+all: init-bin login-bin shell-bin ls-bin clock-bin cp-bin fdisk-bin format-bin disklabel-bin ubistry-bin edit-bin
 # test-bin pwd-bin cat-bin ld-dyn-bin de-bin goofball-bin
 
 init-bin: init 
@@ -58,6 +58,9 @@
 ubistry-bin: ubistry
 	(cd ubistry;make)
 
+edit-bin: edit
+	(cd edit;make)
+
 clean:
 	(cd cp;make clean)
 	(cd fdisk;make clean)
@@ -71,3 +74,4 @@
 	(cd disklabel;make clean)
 	(cd ubistry;make clean)
 	(cd ld;make clean)
+	(cd edit;make clean)
diff --git a/src/bin/edit/Makefile b/src/bin/edit/Makefile
new file mode 100644
index 0000000..87eaa45
--- /dev/null
+++ b/src/bin/edit/Makefile
@@ -0,0 +1,46 @@
+# $Id$
+# Application Makefile (C) 2002-2004 The UbixOS Project
+
+# Include Global 'Source' Options
+include ../../Makefile.inc
+include ../Makefile.inc
+
+#Linker
+LD = ld
+
+#Binary File Name
+BINARY = init
+
+#Delete Program
+REMOVE = rm -f
+
+#Objects
+OBJS = main.o
+
+#Startup File
+STARTUP = ../../lib/ubix/startup.o
+
+# Link The Binary
+$(BINARY) : $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(STARTUP) $(LIBRARIES) $(OBJS)
+	strip $(BINARY)
+
+# Compile the source files
+.cc.o:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+
+.cc.s:
+	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.c.o:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
+ 
+.c.s:
+	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
+ 
+.S.o:
+	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
+ 
+# Clean Up The junk
+clean:
+	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/src/bin/edit/main.c b/src/bin/edit/main.c
new file mode 100644
index 0000000..f026e6e
--- /dev/null
+++ b/src/bin/edit/main.c
@@ -0,0 +1,40 @@
+/*****************************************************************************************
+ Copyright (c) 2002-2004 The UbixOS Project
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are
+ permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of
+ conditions, the following disclaimer and the list of authors.  Redistributions in binary
+ form must reproduce the above copyright notice, this list of conditions, the following
+ disclaimer and the list of authors in the documentation and/or other materials provided
+ with the distribution. Neither the name of the UbixOS Project nor the names of its
+ contributors may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ $Id$
+
+*****************************************************************************************/
+
+#include <stdio.h>
+
+int main(int argc,char **argv) {
+  printf("UbixOS Text Editor\n");
+  return(0);
+  }
+
+/***
+ $Log$
+ END
+ ***/
diff --git a/src/bin/shell/commands.c b/src/bin/shell/commands.c
index b4ae750..ddfd2e5 100644
--- a/src/bin/shell/commands.c
+++ b/src/bin/shell/commands.c
@@ -93,6 +93,9 @@
   else if (memcmp(data->args->arg,"id",2) == 0x0) {
     printf("UID: %i, GID: %i\n",getuid(),getgid());
     }
+  else if (!strcmp(data->argv[0],"reboot")) {
+    mpiPostMessage("system",1000,0x0);
+    }
   else {
     return(0);
     }