diff --git a/apps/Appstore.lua b/apps/Appstore.lua
new file mode 100644
index 0000000..f36dda8
--- /dev/null
+++ b/apps/Appstore.lua
@@ -0,0 +1,414 @@
+requireInjector(getfenv(1))
+
+local Config = require('config')
+local SHA1   = require('sha1')
+local UI     = require('ui')
+local Util   = require('util')
+
+-- scrap this entire file. don't muck with standard apis
+
+local REGISTRY_DIR = 'usr/.registry'
+
+
+--                                           FIX SOMEDAY
+function os.registerApp(app, key)
+
+  app.key = SHA1.sha1(key)
+  Util.writeTable(fs.combine(REGISTRY_DIR, app.key), app)
+  os.queueEvent('os_register_app')
+end
+
+function os.unregisterApp(key)
+
+  local filename = fs.combine(REGISTRY_DIR, SHA1.sha1(key))
+  if fs.exists(filename) then
+    fs.delete(filename)
+    os.queueEvent('os_register_app')
+  end
+end
+
+
+local sandboxEnv = Util.shallowCopy(getfenv(1))
+setmetatable(sandboxEnv, { __index = _G })
+
+multishell.setTitle(multishell.getCurrent(), 'App Store')
+UI:configure('Appstore', ...)
+
+local APP_DIR = 'usr/apps'
+
+local sources = {
+
+  { text = "STD Default",
+    event = 'source',
+    url = "http://pastebin.com/raw/zVws7eLq" }, --stock
+--[[
+  { text = "Discover",
+    event = 'source',
+    generateName = true,
+    url = "http://pastebin.com/raw/9bXfCz6M" }, --owned by dannysmc95
+
+  { text = "Opus",
+    event = 'source',
+    url = "http://pastebin.com/raw/ajQ91Rmn" },
+]]
+}
+
+shell.setDir(APP_DIR)
+
+function downloadApp(app)
+  local h
+
+  if type(app.url) == "table" then
+    h = contextualGet(app.url[1])
+  else
+    h = http.get(app.url)
+  end
+
+  if h then
+    local contents = h.readAll()
+    h:close()
+    return contents
+  end
+end
+
+function runApp(app, checkExists, ...)
+
+  local path, fn
+  local args = { ... }
+
+  if checkExists and fs.exists(fs.combine(APP_DIR, app.name)) then
+    path = fs.combine(APP_DIR, app.name)
+  else
+    local program = downloadApp(app)
+
+    fn = function() 
+
+      if not program then
+        error('Failed to download')
+      end
+
+      local fn = loadstring(program, app.name)
+
+      if not fn then
+        error('Failed to download')
+      end
+
+      setfenv(fn, sandboxEnv)
+      fn(unpack(args))
+    end
+  end
+
+  multishell.openTab({
+    title = app.name,
+    env = sandboxEnv,
+    path = path,
+    fn = fn,
+    focused = true,
+  })
+
+  return true, 'Running program'
+end
+
+local installApp = function(app)
+
+  local program = downloadApp(app)
+  if not program then
+    return false, "Failed to download"
+  end
+
+  local fullPath = fs.combine(APP_DIR, app.name)
+  Util.writeFile(fullPath, program)
+  return true, 'Installed as ' .. fullPath
+end
+
+local viewApp = function(app)
+
+  local program = downloadApp(app)
+  if not program then
+    return false, "Failed to download"
+  end
+
+  Util.writeFile('/.source', program)
+  shell.openForegroundTab('edit /.source')
+  fs.delete('/.source')
+  return true
+end
+
+local getSourceListing = function(source)
+  local contents = http.get(source.url)
+  if contents then
+
+    local fn = loadstring(contents.readAll(), source.text)
+    contents.close()
+
+    local env = { std = { } }
+    setmetatable(env, { __index = _G })
+    setfenv(fn, env)
+    fn()
+
+    if env.contextualGet then
+      contextualGet = env.contextualGet
+    end
+
+    source.storeURLs = env.std.storeURLs
+    source.storeCatagoryNames = env.std.storeCatagoryNames
+
+    if source.storeURLs and source.storeCatagoryNames then
+      for k,v in pairs(source.storeURLs) do
+        if source.generateName then
+          v.name = v.title:match('(%w+)')
+          if not v.name or #v.name == 0 then
+            v.name = tostring(k)
+          else
+            v.name = v.name:lower()
+          end
+        else
+          v.name = k
+        end
+        v.categoryName = source.storeCatagoryNames[v.catagory]
+        v.ltitle = v.title:lower()
+      end
+    end
+  end
+end
+
+local appPage = UI.Page({
+  backgroundColor = UI.ViewportWindow.defaults.backgroundColor,
+  menuBar = UI.MenuBar({
+    showBackButton = not pocket,
+    buttons = {
+      { text = 'Install', event = 'install' },
+      { text = 'Run',     event = 'run'     },
+      { text = 'View',    event = 'view'    },
+      { text = 'Remove',  event = 'uninstall', name = 'removeButton' },
+    },
+  }),
+  container = UI.Window({
+    x = 2,
+    y = 3,
+    height = UI.term.height - 3,
+    width = UI.term.width - 2,
+    viewport = UI.ViewportWindow(),
+  }),
+  notification = UI.Notification(),
+  accelerators = {
+    q = 'back',
+    backspace = 'back',
+  },
+})
+
+function appPage.container.viewport:draw()
+  local app = self.parent.parent.app
+  local str = string.format(
+    'By: %s\nCategory: %s\nFile name: %s\n\n%s',
+    app.creator, app.categoryName, app.name, app.description)
+
+  self:clear()
+  local y = self:wrappedWrite(1, 1, app.title, self.width, nil, colors.yellow)
+  self.height = self:wrappedWrite(1, y, str, self.width)
+
+  if appPage.notification.enabled then
+    appPage.notification:draw()
+  end
+end
+
+function appPage:enable(source, app)
+  self.source = source
+  self.app = app
+  UI.Page.enable(self)
+
+  self.container.viewport:setScrollPosition(0)
+  if fs.exists(fs.combine(APP_DIR, app.name)) then
+    self.menuBar.removeButton:enable('Remove')
+  else
+    self.menuBar.removeButton:disable('Remove')
+  end
+end
+
+function appPage:eventHandler(event)
+  if event.type == 'back' then
+    UI:setPreviousPage()
+
+  elseif event.type == 'run' then
+    self.notification:info('Running program', 3)
+    self:sync()
+    runApp(self.app, true)
+
+  elseif event.type == 'view' then
+    self.notification:info('Downloading program', 3)
+    self:sync()
+    viewApp(self.app)
+
+  elseif event.type == 'uninstall' then
+    if self.app.runOnly then
+      s,m = runApp(self.app, false, 'uninstall')
+    else
+      fs.delete(fs.combine(APP_DIR, self.app.name))
+      self.notification:success("Uninstalled " .. self.app.name, 3)
+      self:focusFirst(self)
+      self.menuBar.removeButton:disable('Remove')
+      self.menuBar:draw()
+
+      os.unregisterApp(self.app.creator .. '.' .. self.app.name)
+    end
+
+  elseif event.type == 'install' then
+    self.notification:info("Installing", 3)
+    self:sync()
+    local s, m
+    if self.app.runOnly then
+      s,m = runApp(self.app, false)
+    else
+      s,m = installApp(self.app)
+    end
+    if s then
+      self.notification:success(m, 3)
+
+      if not self.app.runOnly then
+        self.menuBar.removeButton:enable('Remove')
+        self.menuBar:draw()
+
+        local category = 'Apps'
+        if self.app.catagoryName == 'Game' then
+          category = 'Games'
+        end
+
+        os.registerApp({
+          run = fs.combine(APP_DIR, self.app.name),
+          title = self.app.title,
+          category = category,
+          icon = self.app.icon,
+        }, self.app.creator .. '.' .. self.app.name)
+      end
+    else
+      self.notification:error(m, 3)
+    end
+  else
+    return UI.Page.eventHandler(self, event)
+  end
+  return true
+end
+
+local categoryPage = UI.Page({
+  menuBar = UI.MenuBar({
+    buttons = {
+      { text = 'Catalog',  event = 'dropdown', dropdown = 'sourceMenu'   },
+      { text = 'Category', event = 'dropdown', dropdown = 'categoryMenu' },
+    },
+  }),
+  sourceMenu = UI.DropMenu({
+    buttons = sources,
+  }),
+  grid = UI.ScrollingGrid({
+    y = 2,
+    height = UI.term.height - 2,
+    columns = {
+      { heading = 'Title', key = 'title' },
+    },
+    sortColumn = 'title',
+    autospace = true,
+  }),
+  statusBar = UI.StatusBar(),
+  accelerators = {
+    l = 'lua',
+    q = 'quit',
+  },
+})
+
+function categoryPage:setCategory(source, name, index)
+  self.grid.values = { }
+  for k,v in pairs(source.storeURLs) do
+    if index == 0 or index == v.catagory then
+      table.insert(self.grid.values, v)
+    end
+  end
+  self.statusBar:setStatus(string.format('%s: %s', source.text, name))
+  self.grid:update()
+  self.grid:setIndex(1)
+end
+
+function categoryPage:setSource(source)
+
+  if not source.categoryMenu then
+
+    self.statusBar:setStatus('Loading...')
+    self.statusBar:draw()
+    self:sync()
+
+    getSourceListing(source)
+
+    if not source.storeURLs then
+      error('Unable to download application list')
+    end
+
+    local buttons = { }
+    for k,v in Util.spairs(source.storeCatagoryNames, 
+          function(a, b) return a:lower() < b:lower() end) do
+
+      if v ~= 'Operating System' then
+        table.insert(buttons, {
+          text = v,
+          event = 'category',
+          index = k,
+        })
+      end
+    end
+
+    source.categoryMenu = UI.DropMenu({
+      y = 2,
+      x = 1,
+      buttons = buttons,
+    })
+    source.index, source.name = Util.first(source.storeCatagoryNames)
+
+    categoryPage:add({
+      categoryMenu = source.categoryMenu
+    })
+  end
+
+  self.source = source
+  self.categoryMenu = source.categoryMenu
+  categoryPage:setCategory(source, source.name, source.index)
+end
+
+function categoryPage.grid:sortCompare(a, b)
+  return a.ltitle < b.ltitle
+end
+
+function categoryPage.grid:getRowTextColor(row, selected)
+  if fs.exists(fs.combine(APP_DIR, row.name)) then
+    return colors.orange
+  end
+  return UI.Grid:getRowTextColor(row, selected)
+end
+
+function categoryPage:eventHandler(event)
+
+  if event.type == 'grid_select' or event.type == 'select' then
+    UI:setPage(appPage, self.source, self.grid:getSelected())
+
+  elseif event.type == 'category' then
+    self:setCategory(self.source, event.button.text, event.button.index)
+    self:setFocus(self.grid)
+    self:draw()
+
+  elseif event.type == 'source' then
+    self:setFocus(self.grid)
+    self:setSource(event.button)
+    self:draw()
+
+  elseif event.type == 'quit' then
+    UI:exitPullEvents()
+
+  else
+    return UI.Page.eventHandler(self, event)
+  end
+  return true
+end
+
+print("Retrieving catalog list")
+categoryPage:setSource(sources[1])
+
+UI:setPage(categoryPage)
+UI:pullEvents()
+UI.term:reset()
diff --git a/apps/Events.lua b/apps/Events.lua
new file mode 100644
index 0000000..178e96d
--- /dev/null
+++ b/apps/Events.lua
@@ -0,0 +1,132 @@
+requireInjector(getfenv(1))
+
+local Event = require('event')
+local UI    = require('ui')
+local Util  = require('util')
+
+multishell.setTitle(multishell.getCurrent(), 'Events')
+UI:configure('Events', ...)
+
+local page = UI.Page({
+  menuBar = UI.MenuBar({
+    buttons = {
+      { text = 'Filter', event = 'filter' },
+      { text = 'Reset',  event = 'reset'  },
+      { text = 'Pause ', event = 'toggle', name = 'pauseButton' },
+    },
+  }),
+  grid = UI.Grid({
+    y = 2,
+    columns = {
+      { heading = 'Event', key = 'event' },
+      { key = 'p1' },
+      { key = 'p2' },
+      { key = 'p3' },
+      { key = 'p4' },
+      { key = 'p5' },
+    },
+    autospace = true,
+  }),
+  accelerators = {
+    f = 'filter',
+    p = 'toggle',
+    r = 'reset',
+    c = 'clear',
+    q = 'quit',
+  },
+  filtered = { },
+})
+
+function page:eventHandler(event)
+
+  if event.type == 'filter' then
+    local entry = self.grid:getSelected()
+    self.filtered[entry.event] = true
+
+  elseif event.type == 'toggle' then
+    self.paused = not self.paused
+    if self.paused then
+      self.menuBar.pauseButton.text = 'Resume'
+    else
+      self.menuBar.pauseButton.text = 'Pause '
+    end
+    self.menuBar:draw()
+
+  elseif event.type == 'grid_select' then
+    multishell.openTab({ path = 'sys/apps/Lua.lua', args = { event.selected }, focused = true })
+
+  elseif event.type == 'reset' then
+    self.filtered = { }
+    self.grid:setValues({ })
+    self.grid:draw()
+    if self.paused then
+      self:emit({ type = 'toggle' })
+    end
+
+  elseif event.type == 'clear' then
+    self.grid:setValues({ })
+    self.grid:draw()
+
+  elseif event.type == 'quit' then
+    Event.exitPullEvents()
+
+  elseif event.type == 'focus_change' then
+    if event.focused == self.grid then
+      if not self.paused then
+        self:emit({ type = 'toggle' })
+      end
+    end
+
+  else
+    return UI.Page.eventHandler(self, event)
+  end
+  return true
+end
+
+function page.grid:getDisplayValues(row)
+  row = Util.shallowCopy(row)
+
+  local function tovalue(s)
+    if type(s) == 'table' then
+      return 'table'
+    end
+    return s
+  end
+
+  for k,v in pairs(row) do
+    row[k] = tovalue(v)
+  end
+
+  return row
+end
+
+function page.grid:draw()
+  self:adjustWidth()
+  UI.Grid.draw(self)
+end
+
+Event.addRoutine(function()
+
+  while true do
+    local e = { os.pullEvent() }
+    if not page.paused and not page.filtered[e[1]] then
+      table.insert(page.grid.values, 1, {
+        event = e[1],
+        p1 = e[2],
+        p2 = e[3],
+        p3 = e[4],
+        p4 = e[5],
+        p5 = e[6],
+      })
+      if #page.grid.values > page.grid.height - 1 then
+        table.remove(page.grid.values, #page.grid.values)
+      end
+      page.grid:update()
+      page.grid:draw()
+      page:sync()
+    end
+  end
+end)
+
+UI:setPage(page)
+UI:pullEvents()
diff --git a/apps/Peripherals.lua b/apps/Peripherals.lua
new file mode 100644
index 0000000..b0f9df4
--- /dev/null
+++ b/apps/Peripherals.lua
@@ -0,0 +1,218 @@
+requireInjector(getfenv(1))
+
+local Event = require('event')
+local UI    = require('ui')
+local Util  = require('util')
+
+multishell.setTitle(multishell.getCurrent(), 'Devices')
+
+--[[ -- PeripheralsPage  -- ]] --
+local peripheralsPage = UI.Page {
+  grid = UI.ScrollingGrid {
+    columns = { 
+      { heading = 'Type', key = 'type' },
+      { heading = 'Side', key = 'side' },
+    },  
+    sortColumn = 'type',
+    height = UI.term.height - 1,
+    autospace = true,
+  },
+  statusBar = UI.StatusBar {
+    status = 'Select peripheral'
+  },
+  accelerators = {
+    q = 'quit',
+  },
+}
+
+function peripheralsPage.grid:draw()
+  local sides = peripheral.getNames()
+
+  Util.clear(self.values)
+  for _,side in pairs(sides) do
+    table.insert(self.values, {
+      type = peripheral.getType(side),
+      side = side
+    })
+  end
+  self:update()
+  self:adjustWidth()
+  UI.Grid.draw(self)
+end
+
+function peripheralsPage:updatePeripherals()
+  if UI:getCurrentPage() == self then
+    self.grid:draw()
+    self:sync()
+  end
+end
+
+function peripheralsPage:eventHandler(event)
+  if event.type == 'quit' then
+    Event.exitPullEvents()
+
+  elseif event.type == 'grid_select' then
+    UI:setPage('methods', event.selected)
+
+  end
+  return UI.Page.eventHandler(self, event)
+end
+
+--[[ -- MethodsPage  -- ]] --
+local methodsPage = UI.Page {
+  grid = UI.ScrollingGrid {
+    columns = { 
+      { heading = 'Name', key = 'name', width = UI.term.width }
+    },  
+    sortColumn = 'name',
+    height = 7,
+  },
+  viewportConsole = UI.ViewportWindow {
+    y = 8,
+    height = UI.term.height - 8,
+    backgroundColor = colors.brown,
+  },
+  statusBar = UI.StatusBar {
+    status = 'q to return',
+  },
+  accelerators = {
+    q = 'back',
+    backspace = 'back',
+  },
+}
+
+function methodsPage:enable(p)
+
+  self.peripheral = p or self.peripheral
+
+  local p = peripheral.wrap(self.peripheral.side)
+  if p.getDocs then
+    self.grid.values = { }
+    for k,v in pairs(p.getDocs()) do
+      table.insert(self.grid.values, {
+        name = k,
+        doc = v,
+      })
+    end
+  elseif not p.getAdvancedMethodsData then
+    self.grid.values = { }
+    for name,f in pairs(p) do
+      table.insert(self.grid.values, {
+        name = name,
+        noext = true,
+      })
+    end
+  else
+    self.grid.values = p.getAdvancedMethodsData()
+    for name,f in pairs(self.grid.values) do
+      f.name = name
+    end
+  end
+
+  self.viewportConsole.offy = 0
+
+  self.grid:update()
+  self.grid:setIndex(1)
+
+  self.statusBar:setStatus(self.peripheral.type)
+  UI.Page.enable(self)
+end
+
+function methodsPage:eventHandler(event)
+  if event.type == 'back' then
+    UI:setPage(peripheralsPage)
+    return true
+  elseif event.type == 'grid_focus_row' then
+    self.viewportConsole.offy = 0
+    self.viewportConsole:draw()
+  end
+  return UI.Page.eventHandler(self, event)
+end
+
+function methodsPage.viewportConsole:draw()
+  local c = self
+  local method = methodsPage.grid:getSelected()
+
+  c:clear()
+  c:setCursorPos(1, 1)
+
+  if method.noext then
+    c.cursorY = 2
+    c:print('No extended Information')
+    return 2
+  end
+
+  if method.doc then
+    c:print(method.doc, nil, colors.yellow)
+    c.ymax = c.cursorY + 1
+    return
+  end
+
+  if method.description then
+    c:print(method.description)
+  end
+
+  c.cursorY = c.cursorY + 2
+  c.cursorX = 1
+
+  if method.returnTypes ~= '()' then
+    c:print(method.returnTypes .. ' ', nil, colors.yellow)
+  end
+  c:print(method.name, nil, colors.black)
+  c:print('(')
+
+  local maxArgLen = 1
+
+  for k,arg in ipairs(method.args) do
+    if #arg.description > 0 then
+      maxArgLen = math.max(#arg.name, maxArgLen)
+    end
+    local argName = arg.name
+    local fg = colors.green
+    if arg.optional then
+      argName = string.format('[%s]', arg.name)
+      fg = colors.orange
+    end
+    c:print(argName, nil, fg)
+    if k < #method.args then
+      c:print(', ')
+    end
+  end
+  c:print(')')
+
+  c.cursorY = c.cursorY + 1
+
+  if #method.args > 0 then
+    for _,arg in ipairs(method.args) do
+      if #arg.description > 0 then
+        c.cursorY = c.cursorY + 1
+        c.cursorX = 1
+        local fg = colors.green
+        if arg.optional then
+          fg = colors.orange
+        end
+        c:print(arg.name .. ': ', nil, fg)
+        c.cursorX = maxArgLen + 3
+        c:print(arg.description, nil, nil, maxArgLen + 3)
+      end
+    end
+  end
+
+  c.ymax = c.cursorY + 1
+end
+
+Event.on('peripheral', function()
+  peripheralsPage:updatePeripherals()
+end)
+
+Event.on('peripheral_detach', function()
+  peripheralsPage:updatePeripherals()
+end)
+
+UI:setPage(peripheralsPage)
+
+UI:setPages({
+  methods = methodsPage,
+})
+
+UI:pullEvents()
diff --git a/apps/Script.lua b/apps/Script.lua
new file mode 100644
index 0000000..c90545e
--- /dev/null
+++ b/apps/Script.lua
@@ -0,0 +1,563 @@
+requireInjector(getfenv(1))
+
+local Config = require('config')
+local Event  = require('event')
+local Socket = require('socket')
+local UI     = require('ui')
+local Util   = require('util')
+
+local GROUPS_PATH = 'usr/groups'
+local SCRIPTS_PATH = 'usr/etc/scripts'
+
+multishell.setTitle(multishell.getCurrent(), 'Script')
+UI:configure('script', ...)
+
+local config = {
+  showGroups = false,
+  variables = [[{
+    COMPUTER_ID = os.getComputerID(),
+  }]],
+}
+
+Config.load('script', config)
+
+local width = math.floor(UI.term.width / 2) - 1
+if UI.term.width % 2 ~= 0 then
+  width = width + 1
+end
+
+function processVariables(script)
+
+  local fn = loadstring('return ' .. config.variables)
+  if fn then
+    local variables = fn()
+
+    for k,v in pairs(variables) do
+      local token = string.format('{%s}', k)
+      script = script:gsub(token, v)
+    end
+  end
+  return script
+end
+
+function invokeScript(computer, scriptName)
+
+  local script = Util.readFile(scriptName)
+  if not script then
+    print('Unable to read script file')
+  end
+
+  local socket = Socket.connect(computer.id, 161)
+  if not socket then
+    print('Unable to connect to ' .. computer.id)
+    return
+  end
+
+  script = processVariables(script)
+
+  Util.print('Running %s on %s', scriptName, computer.label)
+  socket:write({ type = 'script', args = script })
+  --[[
+  local response = socket:read(2)
+
+  if response and response.result then
+    if type(response.result) == 'table' then
+      print(textutils.serialize(response.result))
+    else
+      print(tostring(response.result))
+    end
+  else
+    printError('No response')
+  end
+  --]]
+
+  socket:close()
+end
+
+function runScript(computerOrGroup, scriptName)
+  if computerOrGroup.id then
+    invokeScript(computerOrGroup, scriptName)
+  else
+    local list = computerOrGroup.list
+    if computerOrGroup.path then
+      list = Util.readTable(computerOrGroup.path)
+    end
+    if list then
+      for _,computer in pairs(list) do
+        invokeScript(computer, scriptName)
+      end
+    end
+  end
+end
+
+local function getActiveComputers(t)
+  t = t or { }
+  Util.clear(t)
+  for k,computer in pairs(_G.network) do
+    if computer.active then
+      t[k] = computer
+    end
+  end
+  return t
+end
+
+local function getTurtleList()
+  local turtles = {
+    label = 'Turtles',
+    list = { },
+  }
+  for k,computer in pairs(getActiveComputers()) do
+    if computer.fuel then
+      turtles.list[k] = computer
+    end
+  end
+  return turtles
+end
+
+local args = { ... }
+if #args == 2 then
+  local key = args[1]
+  local script = args[2]
+  local target
+  if tonumber(key) then
+    target = _G.network[tonumber(key)]
+  elseif key == 'All' then
+    target = {
+      list = Util.shallowCopy(getActiveComputers()),
+    }
+  elseif key == 'Localhost' then
+    target = { id = os.getComputerID() }
+  elseif key == 'Turtles' then
+    target = getTurtleList()
+  else
+    target = Util.readTable(fs.combine(GROUPS_PATH, key))
+  end
+
+  if not target then
+    error('Syntax: Script <ID or group> <script>')
+  end
+
+  runScript(target, fs.combine(SCRIPTS_PATH, script))
+  return
+end
+
+local function getListing(t, path)
+  Util.clear(t)
+  local files = fs.list(path)
+  for _,f in pairs(files) do
+    table.insert(t, { label = f, path = fs.combine(path, f) })
+  end
+end
+
+local mainPage = UI.Page({
+  menuBar = UI.MenuBar({
+    buttons = {
+      { text = 'Groups', event = 'groups' },
+      { text = 'Scripts', event = 'scripts' },
+      { text = 'Toggle', event = 'toggle' },
+    },
+  }),
+  computers = UI.ScrollingGrid({
+    y = 2,
+    height = UI.term.height-3,
+    columns = {
+      { heading = 'Label', key = 'label', width = width },
+    },
+    width = width,
+    sortColumn = 'label',
+  }),
+  scripts = UI.ScrollingGrid({
+    columns = {
+      { heading = 'Name', key = 'label', width = width },
+    },
+    sortColumn = 'label',
+    height = UI.term.height - 3,
+    width = width,
+    x = UI.term.width - width + 1,
+    y = 2,
+  }),
+  statusBar = UI.StatusBar({
+    columns = {
+      { '', 'status', 4 },
+      { '', 'fuelF', 5 },
+      { '', 'distanceF', 4 },
+    },
+    autospace = true,
+  }),
+  accelerators = {
+    q = 'quit',
+  },
+})
+
+local editorPage = UI.Page({
+  menuBar = UI.MenuBar({
+    showBackButton = true,
+    buttons = {
+      { text = 'Save', event = 'save', help = 'Save this group' },
+    },
+  }),
+  grid1 = UI.ScrollingGrid({
+    columns = {
+      { heading = 'Name', key = 'label', width = width },
+    },
+    sortColumn = 'label',
+    height = UI.term.height - 4,
+    width = width,
+    y = 3,
+  }),
+  right = UI.Button({
+    text = '>', 
+    event = 'right',
+    x = width - 2,
+    y = 2,
+    width = 3,
+  }),
+  left = UI.Button({
+    text = '<', 
+    event = 'left',
+    x = UI.term.width - width + 1,
+    y = 2,
+    width = 3,
+  }),
+  grid2 = UI.ScrollingGrid({
+    columns = {
+      { heading = 'Name', key = 'label', width = width },
+    },
+    sortColumn = 'label',
+    height = UI.term.height - 4,
+    width = width,
+    x = UI.term.width - width + 1,
+    y = 3,
+  }),
+  statusBar = UI.StatusBar(),
+  accelerators = {
+    q = 'back',
+  },
+})
+
+local groupsPage = UI.Page({
+  menuBar = UI.MenuBar({
+    showBackButton = true,
+    buttons = {
+      { text = 'Add',    event = 'add'    },
+      { text = 'Edit',   event = 'edit'   },
+      { text = 'Delete', event = 'delete' },
+    },
+  }),
+  grid = UI.ScrollingGrid({
+    y = 2,
+    height = UI.term.height-2,
+    columns = {
+      { heading = 'Name', key = 'label' },
+    },
+    sortColumn = 'label',
+    autospace = true,
+  }),
+  statusBar = UI.StatusBar(),
+  accelerators = {
+    q = 'back',
+  },
+})
+
+local scriptsPage = UI.Page({
+  menuBar = UI.MenuBar({
+    showBackButton = true,
+    buttons = {
+      { text = 'Add',    event = 'add'    },
+      { text = 'Edit',   event = 'edit'   },
+      { text = 'Delete', event = 'delete' },
+    },
+  }),
+  grid = UI.ScrollingGrid({
+    y = 2,
+    height = UI.term.height-2,
+    columns = {
+      { heading = 'Name', key = 'label' },
+    },
+    sortColumn = 'label',
+    autospace = true,
+  }),
+  statusBar = UI.StatusBar(),
+  accelerators = {
+    a = 'add',
+    e = 'edit',
+    delete = 'delete',
+    q = 'back',
+  },
+})
+
+function editorPage:enable()
+  self:focusFirst()
+
+  local groupPath = fs.combine(GROUPS_PATH, self.groupName)
+  if fs.exists(groupPath) then
+    self.grid1.values = Util.readTable(groupPath)
+  else
+    Util.clear(self.grid1.values)
+  end
+  self.grid1:update()
+  UI.Page.enable(self)
+end
+
+function editorPage.grid2:draw()
+
+  getActiveComputers(self.values)
+
+  for k in pairs(editorPage.grid1.values) do
+    self.values[k] = nil
+  end
+  self:update()
+
+  UI.ScrollingGrid.draw(self)
+end
+
+function editorPage:eventHandler(event)
+
+  if event.type == 'back' then
+    UI:setPage(groupsPage)
+
+  elseif event.type == 'left' then
+    local computer = self.grid2:getSelected()
+    self.grid1.values[computer.id] = computer
+    self.grid1:update()
+    self.grid1:draw()
+    self.grid2:draw()
+
+  elseif event.type == 'right' then
+    local computer = self.grid1:getSelected()
+    self.grid1.values[computer.id] = nil
+    self.grid1:update()
+    self.grid1:draw()
+    self.grid2:draw()
+
+  elseif event.type == 'save' then
+    Util.writeTable(fs.combine(GROUPS_PATH, self.groupName), self.grid1.values)
+    UI:setPage(groupsPage)
+  end
+
+  return UI.Page.eventHandler(self, event)
+end
+
+local function nameDialog(f)
+  local dialog = UI.Dialog({
+--    x = (UI.term.width - 28) / 2,
+    width = 22,
+    title = 'Enter Name',
+    form = UI.Form {
+      x = 2, rex = -2, y = 2,
+      textEntry = UI.TextEntry({ y = 3, width = 20, limit = 20 })
+    },
+  })
+
+  dialog.eventHandler = function(self, event)
+    if event.type == 'form_complete' then
+      local name = self.form.textEntry.value
+      if name then
+        f(name)
+      else
+        self.statusBar:timedStatus('Invalid Name', 3)
+      end
+      return true
+    elseif event.type == 'form_cancel' or event.type == 'cancel' then
+      UI:setPreviousPage()
+    else
+      return UI.Dialog.eventHandler(self, event)
+    end
+  end
+
+  dialog:setFocus(dialog.form.textEntry)
+  UI:setPage(dialog)
+end
+
+function groupsPage:draw()
+  getListing(self.grid.values, GROUPS_PATH)
+  self.grid:update()
+  UI.Page.draw(self)
+end
+
+function groupsPage:enable()
+  self:focusFirst()
+  UI.Page.enable(self)
+end
+
+function groupsPage:eventHandler(event)
+
+  if event.type == 'back' then
+    UI:setPage(mainPage)
+
+  elseif event.type == 'add' then
+    nameDialog(function(name)
+        editorPage.groupName = name
+        UI:setPage(editorPage)
+      end)
+
+  elseif event.type == 'delete' then
+    fs.delete(fs.combine(GROUPS_PATH, self.grid:getSelected().label))
+    self:draw()
+
+  elseif event.type == 'edit' then
+    editorPage.groupName = self.grid:getSelected().label
+    UI:setPage(editorPage)
+  end
+
+  return UI.Page.eventHandler(self, event)
+end
+
+function scriptsPage:draw()
+  getListing(self.grid.values, SCRIPTS_PATH)
+  self.grid:update()
+  UI.Page.draw(self)
+end
+
+function scriptsPage:enable()
+  self:focusFirst()
+  UI.Page.enable(self)
+end
+
+function scriptsPage:eventHandler(event)
+
+  if event.type == 'back' then
+    UI:setPreviousPage()
+
+  elseif event.type == 'add' then
+    nameDialog(function(name)
+        shell.run('edit ' .. fs.combine(SCRIPTS_PATH, name))
+        UI:setPreviousPage()
+      end)
+
+  elseif event.type == 'edit' then
+    local name = fs.combine(SCRIPTS_PATH, self.grid:getSelected().label)
+    shell.run('edit  ' .. name)
+    self:draw()
+
+  elseif event.type == 'delete' then
+    local name = fs.combine(SCRIPTS_PATH, self.grid:getSelected().label)
+    fs.delete(name)
+    self:draw()
+  end
+
+  return UI.Page.eventHandler(self, event)
+end
+
+function mainPage:eventHandler(event)
+
+  if event.type == 'quit' then
+    Event.exitPullEvents()
+
+  elseif event.type == 'groups' then
+    UI:setPage(groupsPage)
+
+  elseif event.type == 'scripts' then
+    UI:setPage(scriptsPage)
+
+  elseif event.type == 'toggle' then
+    config.showGroups = not config.showGroups
+    local text = 'Computers'
+    if config.showGroups then
+      text = 'Groups'
+    end
+--    self.statusBar.toggleButton.text = text
+    self:draw()
+
+    Config.update('script', config)
+
+  elseif event.type == 'grid_focus_row' then
+    local computer = self.computers:getSelected()
+    self.statusBar.values = { computer }
+    self.statusBar:draw()
+
+  elseif event.type == 'grid_select' then
+
+    local script = self.scripts:getSelected()
+    local computer = self.computers:getSelected()
+
+    self:clear()
+    self:sync()
+    self.enabled = false
+    runScript(computer, script.path)
+    print()
+    print('Press any key to continue...')
+    while true do
+      local e = os.pullEvent()
+      if e == 'char' or e == 'key' or e == 'mouse_click' then
+        break
+      end
+    end
+    self.enabled = true
+    self:draw()
+  end
+
+  return UI.Page.eventHandler(self, event)
+end
+
+function mainPage.statusBar:draw()
+  local computer = self.values[1]
+  if computer then
+    if computer.fuel then
+      computer.fuelF = string.format("%dk", math.floor(computer.fuel/1000))
+    end
+    if computer.distance then
+      computer.distanceF = Util.round(computer.distance, 1)
+    end
+    mainPage.statusBar:adjustWidth()
+  end
+  UI.StatusBar.draw(self)
+end
+
+function mainPage:draw()
+  getListing(self.scripts.values, SCRIPTS_PATH)
+
+  if config.showGroups then
+    getListing(self.computers.values, GROUPS_PATH)
+    table.insert(self.computers.values, {
+      label = 'All',
+      list = getActiveComputers(),
+    })
+    table.insert(self.computers.values, getTurtleList())
+    table.insert(self.computers.values, {
+      label = 'Localhost',
+      id = os.getComputerID(),
+    })
+  else
+    getActiveComputers(self.computers.values)
+  end
+  self.scripts:update()
+  self.computers:update()
+  UI.Page.draw(self)
+end
+
+if not fs.exists(SCRIPTS_PATH) then
+  fs.makeDir(SCRIPTS_PATH)
+end
+
+if not fs.exists(GROUPS_PATH) then
+  fs.makeDir(GROUPS_PATH)
+end
+
+Event.on('network_attach', function()
+  if mainPage.enabled then
+    mainPage:draw()
+  end
+end)
+
+Event.on('network_detach', function()
+  if mainPage.enabled then
+    mainPage:draw()
+  end
+end)
+
+Event.onInterval(1, function()
+  if mainPage.enabled then
+    local selected = mainPage.computers:getSelected()
+    if selected then
+      local computer = _G.network[selected.id]
+      mainPage.statusBar.values = { computer }
+      mainPage.statusBar:draw()
+      mainPage:sync()
+    end
+  end
+end)
+
+UI:setPage(mainPage)
+UI:pullEvents()
+UI.term:reset()
diff --git a/apps/Turtles.lua b/apps/Turtles.lua
new file mode 100644
index 0000000..249b743
--- /dev/null
+++ b/apps/Turtles.lua
@@ -0,0 +1,339 @@
+requireInjector(getfenv(1))
+
+local Event    = require('event')
+local itemDB   = require('itemDB')
+local Socket   = require('socket')
+local Terminal = require('terminal')
+local UI       = require('ui')
+local Util     = require('util')
+
+multishell.setTitle(multishell.getCurrent(), 'Turtles')
+UI.Button.defaults.focusIndicator = ' '
+UI:configure('Turtles', ...)
+
+local options = {
+  turtle      = { arg = 'i', type = 'number', value = -1,
+                 desc = 'Turtle ID' },
+  tab         = { arg = 's', type = 'string', value = 'turtles',
+                 desc = 'Selected tab to display' },
+  help        = { arg = 'h', type = 'flag',   value = false,
+                 desc = 'Displays the options' },
+}
+
+local SCRIPTS_PATH = 'usr/etc/scripts'
+
+local nullTerm = Terminal.getNullTerm(term.current())
+local turtles = { }
+local socket
+local policies = { 
+  { label = 'none' },
+  { label = 'digOnly' },
+  { label = 'attackOnly' },
+  { label = 'digAttack' },
+  { label = 'turtleSafe' },
+}
+
+local page = UI.Page {
+--[[
+  policy = UI.Chooser {
+    x = 2, y = 8,
+    choices = {
+      { name = ' None ', value = 'none'       },
+      { name = ' Safe ', value = 'turtleSafe' },
+    },
+  },
+]]
+  coords = UI.Window {
+    x = 2, y = 2, height = 3, rex = -2,
+  },
+  tabs = UI.Tabs {
+    x = 1, y = 5, rey = -2,
+    scripts = UI.Grid {
+      tabTitle = 'Run',
+      backgroundColor = UI.TabBar.defaults.selectedBackgroundColor,
+      columns = {
+        { heading = '', key = 'label' },
+      },
+      disableHeader = true,
+      sortColumn = 'label',
+      autospace = true,
+    },
+    turtles = UI.Grid {
+      tabTitle = 'Sel',
+      backgroundColor = UI.TabBar.defaults.selectedBackgroundColor,
+      columns = {
+        { heading = 'label',  key = 'label'    },
+        { heading = 'Dist',   key = 'distance' },
+        { heading = 'Status', key = 'status'   },
+        { heading = 'Fuel',   key = 'fuel'     },
+      },
+      disableHeader = true,
+      sortColumn = 'label',
+      autospace = true,
+    },
+    inventory = UI.Grid {
+      backgroundColor = UI.TabBar.defaults.selectedBackgroundColor,
+      tabTitle = 'Inv',
+      columns = {
+        { heading = '',          key = 'index', width = 2 },
+        { heading = '',          key = 'qty', width = 2 },
+        { heading = 'Inventory', key = 'id',  width = UI.term.width - 7 },
+      },
+      disableHeader = true,
+      sortColumn = 'index',
+    },
+    policy = UI.Grid {
+      tabTitle = 'Mod',
+      backgroundColor = UI.TabBar.defaults.selectedBackgroundColor,
+      columns = {
+        { heading = 'label', key = 'label' },
+      },
+      values = policies,
+      disableHeader = true,
+      sortColumn = 'label',
+      autospace = true,
+    },
+    action = UI.Window {
+      tabTitle = 'Act',
+      moveUp = UI.Button {
+        x = 5, y = 2,
+        text = '/\\',
+        fn = 'turtle.up',
+      },
+      moveDown = UI.Button {
+        x = 5, y = 4,
+        text = '\\/',
+        fn = 'turtle.down',
+      },
+      moveForward = UI.Button {
+        x = 9, y = 3,
+        text = '>',
+        fn = 'turtle.forward',
+      },
+      moveBack = UI.Button {
+        x = 2, y = 3,
+        text = '<',
+        fn = 'turtle.back',
+      },
+      turnLeft = UI.Button {
+        x = 2, y = 6,
+        text = '<-',
+        fn = 'turtle.turnLeft',
+      },
+      turnRight = UI.Button {
+        x = 8, y = 6,
+        text = '->',
+        fn = 'turtle.turnRight',
+      },
+    },
+  },
+  statusBar = UI.StatusBar(),
+  notification = UI.Notification(),
+  accelerators = {
+    q = 'quit',
+  },
+}
+
+function page:enable(turtle)
+  self.turtle = turtle
+  UI.Page.enable(self)
+end
+
+function page:runFunction(script, nowrap)
+  if not socket then
+    socket = Socket.connect(self.turtle.id, 161)
+    if not socket then
+      self.notification:error('Unable to connect')
+      return
+    end
+  end
+
+  if not nowrap then
+    script = 'turtle.run(' .. script .. ')'
+  end
+  socket:write({ type = 'script', args = script })
+end
+
+function page:runScript(scriptName)
+  if self.turtle then
+    self.notification:info('Connecting')
+    self:sync()
+
+    local cmd = string.format('Script %d %s', self.turtle.id, scriptName)
+    local ot = term.redirect(nullTerm)
+    pcall(function() shell.run(cmd) end)
+    term.redirect(ot)
+    self.notification:success('Sent')
+  end
+end
+
+function page.coords:draw()
+  local t = self.parent.turtle
+  if t then
+    self:clear()
+    self:setCursorPos(1, 1)
+    local ind = 'GPS'
+    if not t.point.gps then
+      ind = 'REL'
+    end
+    self:print(string.format('%s : %d,%d,%d\nFuel: %s\n', 
+      ind, t.point.x, t.point.y, t.point.z, Util.toBytes(t.fuel)))
+  end
+end
+
+--[[ Inventory Tab ]]--
+function page.tabs.inventory:getRowTextColor(row, selected)
+  if page.turtle and row.selected then
+    return colors.yellow
+  end
+  return UI.Grid.getRowTextColor(self, row, selected)
+end
+
+function page.tabs.inventory:draw()
+  local t = page.turtle
+  Util.clear(self.values)
+  if t then
+    for _,v in ipairs(t.inventory) do
+      if v.qty > 0 then
+        table.insert(self.values, v)
+        if v.index == t.slotIndex then
+          v.selected = true
+        end
+        if v.id then
+          local item = itemDB:get({ v.id, v.dmg })
+          if item then
+            v.id = item.displayName
+          else
+            v.id = v.id:gsub('.*:(.*)', '%1')
+          end
+        end
+      end
+    end
+  end
+  self:adjustWidth()
+  self:update()
+  UI.Grid.draw(self)
+end
+
+function page.tabs.inventory:eventHandler(event)
+  if event.type == 'grid_select' then
+    local fn = string.format('turtle.select(%d)', event.selected.index)
+    page:runFunction(fn)
+  else
+    return UI.Grid.eventHandler(self, event)
+  end
+  return true
+end
+
+function page.tabs.scripts:draw()
+
+  Util.clear(self.values)
+  local files = fs.list(SCRIPTS_PATH)
+  for _,path in pairs(files) do
+    table.insert(self.values, { label = path, path = fs.combine(SCRIPTS_PATH, path) })
+  end
+  self:update()
+  UI.Grid.draw(self)
+end
+
+function page.tabs.scripts:eventHandler(event)
+  if event.type == 'grid_select' then
+    page:runScript(event.selected.label)
+  else
+    return UI.Grid.eventHandler(self, event)
+  end
+  return true
+end
+
+function page.tabs.turtles:getDisplayValues(row)
+  row = Util.shallowCopy(row)
+  if row.fuel then
+    row.fuel = Util.toBytes(row.fuel)
+  end
+  if row.distance then
+    row.distance = Util.round(row.distance, 1)
+  end
+  return row
+end
+
+function page.tabs.turtles:draw()
+  Util.clear(self.values)
+  for _,v in pairs(network) do
+    if v.fuel then
+      table.insert(self.values, v)
+    end
+  end
+  self:update()
+  UI.Grid.draw(self)
+end
+
+function page.tabs.turtles:eventHandler(event)
+  if event.type == 'grid_select' then
+    page.turtle = event.selected
+    if socket then
+      socket:close()
+      socket = nil
+    end
+  else
+    return UI.Grid.eventHandler(self, event)
+  end
+  return true
+end
+
+function page.statusBar:draw()
+  local t = self.parent.turtle
+  if t then
+    local status = string.format('%s [ %s ]', t.status, Util.round(t.distance, 2))
+    self:setStatus(status, true)
+  end
+  UI.StatusBar.draw(self)
+end
+
+function page:eventHandler(event)
+  if event.type == 'quit' then
+    UI:exitPullEvents()
+  elseif event.type == 'button_press' then
+    if event.button.fn then
+      self:runFunction(event.button.fn, event.button.nowrap)
+    elseif event.button.script then
+      self:runScript(event.button.script)
+    end
+  else
+    return UI.Page.eventHandler(self, event)
+  end
+  return true
+end
+
+function page:enable()
+  UI.Page.enable(self)
+--  self.tabs:activateTab(page.tabs.turtles)
+end
+
+if not Util.getOptions(options, { ... }, true) then
+  return
+end
+
+if options.turtle.value >= 0 then
+  for i = 1, 10 do
+    page.turtle = _G.network[options.turtle.value]
+    if page.turtle then
+      break
+    end
+    os.sleep(1)
+  end
+end
+
+Event.onInterval(1, function()
+  if page.turtle then
+    local t = _G.network[page.turtle.id]
+    page.turtle = t
+    page:draw()
+    page:sync()
+  end
+end)
+
+UI:setPage(page)
+
+page.tabs:activateTab(page.tabs[options.tab.value])
+
+UI:pullEvents()
diff --git a/apps/edit.lua b/apps/edit.lua
new file mode 100644
index 0000000..2ba8ef1
--- /dev/null
+++ b/apps/edit.lua
@@ -0,0 +1,1275 @@
+shell.setCompletionFunction(shell.getRunningProgram(), function(shell, index, text)
+  if index == 1 then
+    return fs.complete(text, shell.dir(), true, false)
+  end
+end)
+
+local tArgs = { ... }
+if #tArgs == 0 then
+  error( "Usage: edit <path>" )
+end
+
+-- Error checking
+local sPath = shell.resolve(tArgs[1])
+local bReadOnly = fs.isReadOnly(sPath)
+if fs.exists(sPath) and fs.isDir(sPath) then
+  error( "Cannot edit a directory." )
+end
+
+if multishell then
+  multishell.setTitle(multishell.getCurrent(), sPath)
+end
+
+local x, y      = 1, 1
+local w, h      = term.getSize()
+local scrollX   = 0
+local scrollY   = 0
+local lastPos   = { x = 1, y = 1 }
+local tLines    = { }
+local bRunning  = true
+local sStatus   = ""
+local isError
+local fileInfo
+
+local dirty     = { y = 1, ey = h }
+local mark      = { anchor, active, continue }
+local keyboard
+local searchPattern
+local undo      = { chain = { }, pointer = 0 }
+local complete  = { }
+
+if not clipboard then
+  _G.clipboard = { internal, data }
+  clipboard.shim = true
+
+  function clipboard.setData(data)
+    clipboard.data = data
+    if data then
+      clipboard.useInternal(true)
+    end
+  end
+
+  function clipboard.getText()
+    if clipboard.data then
+      return tostring(clipboard.data)
+    end
+  end
+
+  function clipboard.isInternal()
+    return clipboard.internal
+  end
+
+  function clipboard.useInternal(mode)
+    if mode ~= clipboard.mode then
+      clipboard.internal = mode
+    end
+  end
+end
+
+local color = {
+  textColor       = '0',
+  keywordColor    = '4',
+  commentColor    = 'd',
+  stringColor     = 'e',
+  bgColor         = colors.black,
+  highlightColor  = colors.orange,
+  cursorColor     = colors.lime,
+  errorBackground = colors.red,
+}
+
+if not term.isColor() then
+  color = {
+    textColor       = '0',
+    keywordColor    = '8',
+    commentColor    = '8',
+    stringColor     = '8',
+    bgColor         = colors.black,
+    highlightColor  = colors.lightGray,
+    cursorColor     = colors.white,
+    errorBackground = colors.gray,
+  }
+end
+
+local keyMapping = {
+  -- movement
+  up                        = 'up',
+  down                      = 'down',
+  left                      = 'left',
+  right                     = 'right',
+  pageUp                    = 'pageUp',
+  [ 'control-b'           ] = 'pageUp',
+  pageDown                  = 'pageDown',
+--  [ 'control-f'           ] = 'pageDown',
+  home                      = 'home',
+  [ 'end'                 ] = 'toend',
+  [ 'control-home'        ] = 'top',
+  [ 'control-end'         ] = 'bottom',
+  [ 'control-right'       ] = 'word',
+  [ 'control-left'        ] = 'backword',
+  [ 'scrollUp'            ] = 'scroll_up',
+  [ 'control-up'          ] = 'scroll_up',
+  [ 'scrollDown'          ] = 'scroll_down',
+  [ 'control-down'        ] = 'scroll_down',
+  [ 'mouse_click'         ] = 'goto',
+  [ 'control-l'           ] = 'goto_line',
+
+  -- marking
+  [ 'shift-up'            ] = 'mark_up',
+  [ 'shift-down'          ] = 'mark_down',
+  [ 'shift-left'          ] = 'mark_left',
+  [ 'shift-right'         ] = 'mark_right',
+  [ 'mouse_drag'          ] = 'mark_to',
+  [ 'shift-mouse_click'   ] = 'mark_to',
+  [ 'control-a'           ] = 'mark_all',
+  [ 'control-shift-right' ] = 'mark_word',
+  [ 'control-shift-left'  ] = 'mark_backword',
+  [ 'shift-end'           ] = 'mark_end',
+  [ 'shift-home'          ] = 'mark_home',
+
+  -- editing
+  delete                    = 'delete',
+  backspace                 = 'backspace',
+  enter                     = 'enter',
+  char                      = 'char',
+  paste                     = 'paste',
+  tab                       = 'tab',
+  [ 'control-z'           ] = 'undo',
+  [ 'control-space'       ] = 'autocomplete',
+
+  -- copy/paste
+  [ 'control-x'           ] = 'cut',
+  [ 'control-c'           ] = 'copy',
+  [ 'control-v'           ] = 'paste',
+  [ 'control-t'           ] = 'toggle_clipboard',
+
+  -- file
+  [ 'control-s'           ] = 'save',
+  [ 'control-q'           ] = 'exit',
+  [ 'control-enter'       ] = 'run',
+
+  -- search
+  [ 'control-f'           ] = 'find_prompt',
+  [ 'control-slash'       ] = 'find_prompt',
+  [ 'control-n'           ] = 'find_next',
+
+  -- misc
+  [ 'control-g'           ] = 'status',
+  [ 'control-r'           ] = 'refresh',
+  [ 'leftCtrl'            ] = 'menu',
+}
+
+local messages = {
+  menu    = '^s: save, ^q: quit, ^enter: run',
+  wrapped = 'search hit BOTTOM, continuing at TOP',
+}
+if w < 32 then
+  messages = {
+    menu    = '^s = save, ^q = quit',
+    wrapped = 'search wrapped',
+  }
+end
+
+local function getFileInfo(path)
+  local abspath = shell.resolve(path)
+ 
+  local fi = {
+    abspath = abspath,
+    path = path,
+    isNew = not fs.exists(abspath),
+    dirExists = fs.exists(fs.getDir(abspath)),
+    modified = false,
+  }
+  if fi.isDir then
+    fi.isReadOnly = true
+  else
+    fi.isReadOnly = fs.isReadOnly(fi.abspath)
+  end
+ 
+  return fi
+end
+
+local function setStatus(pattern, ...)
+  sStatus = string.format(pattern, ...)
+end
+
+local function setError(pattern, ...)
+  setStatus(pattern, ...)
+  isError = true
+end
+
+local function load(path)
+  tLines = {}
+  if fs.exists(path) then
+    local file = io.open(path, "r")
+    local sLine = file:read()
+    while sLine do
+      table.insert(tLines, sLine)
+      sLine = file:read()
+    end
+    file:close()
+  end
+
+  if #tLines == 0 then
+    table.insert(tLines, '')
+  end
+
+  fileInfo = getFileInfo(tArgs[1])
+
+  local name = fileInfo.path
+  if w < 32 then
+    name = fs.getName(fileInfo.path)
+  end
+  if fileInfo.isNew then
+    if not fileInfo.dirExists then
+      setStatus('"%s" [New DIRECTORY]', name)
+    else
+      setStatus('"%s" [New File]', name)
+    end
+  elseif fileInfo.isReadOnly then
+    setStatus('"%s" [readonly] %dL, %dC',
+          name, #tLines, fs.getSize(fileInfo.abspath))
+  else
+    setStatus('"%s" %dL, %dC',
+          name, #tLines, fs.getSize(fileInfo.abspath))
+  end
+end
+
+local function save( _sPath )
+  -- Create intervening folder
+  local sDir = _sPath:sub(1, _sPath:len() - fs.getName(_sPath):len() )
+  if not fs.exists( sDir ) then
+    fs.makeDir( sDir )
+  end
+
+  -- Save
+  local file = nil
+  local function innerSave()
+    file = fs.open( _sPath, "w" )
+    if file then
+      for n, sLine in ipairs( tLines ) do
+        file.write(sLine .. "\n")
+      end
+    else
+      error( "Failed to open ".._sPath )
+    end
+  end
+  
+  local ok, err = pcall( innerSave )
+  if file then 
+    file.close()
+  end
+  return ok, err
+end
+
+local function split(str, pattern)
+  pattern = pattern or "(.-)\n"
+  local t = {}
+  local function helper(line) table.insert(t, line) return "" end
+  helper((str:gsub(pattern, helper))) 
+  return t
+end
+
+local tKeywords = {
+  ["and"] = true,
+  ["break"] = true,
+  ["do"] = true,
+  ["else"] = true,
+  ["elseif"] = true,
+  ["end"] = true,
+  ["false"] = true,
+  ["for"] = true,
+  ["function"] = true,
+  ["if"] = true,
+  ["in"] = true,
+  ["local"] = true,
+  ["nil"] = true,
+  ["not"] = true,
+  ["or"] = true,
+  ["repeat"] = true,
+  ["return"] = true,
+  ["then"] = true,
+  ["true"] = true,
+  ["until"]= true,
+  ["while"] = true,
+}
+
+local function writeHighlighted(sLine, ny)
+  local buffer = {
+    fg = '',
+    text = '',
+  }
+
+  local function tryWrite(sLine, regex, fgcolor)
+    local match = sLine:match(regex)
+    if match then
+      local fg
+      if type(fgcolor) == "string" then
+        fg = fgcolor
+      else
+        fg = fgcolor(match)
+      end
+      buffer.text = buffer.text .. match
+      buffer.fg = buffer.fg .. string.rep(fg, #match)
+      return sLine:sub(#match + 1)
+    end
+    return nil
+  end
+
+  while #sLine > 0 do  
+    sLine = 
+      tryWrite(sLine, "^%-%-%[%[.-%]%]", color.commentColor ) or
+      tryWrite(sLine, "^%-%-.*",         color.commentColor ) or
+      tryWrite(sLine, "^\".-[^\\]\"",    color.stringColor  ) or
+      tryWrite(sLine, "^\'.-[^\\]\'",    color.stringColor  ) or
+      tryWrite(sLine, "^%[%[.-%]%]",     color.stringColor  ) or
+      tryWrite(sLine, "^[%w_]+", function(match)
+        if tKeywords[match] then
+          return color.keywordColor
+        end
+        return color.textColor
+      end) or
+      tryWrite(sLine, "^[^%w_]", color.textColor)
+  end
+
+  buffer.fg = buffer.fg .. '7'
+  buffer.text = buffer.text .. '.'
+
+  if mark.active and ny >= mark.y and ny <= mark.ey then
+    local sx = 1
+    if ny == mark.y then
+      sx = mark.x
+    end
+    local ex = #buffer.text
+    if ny == mark.ey then
+      ex = mark.ex
+    end
+    buffer.bg = string.rep('f', sx - 1) .. 
+                string.rep('7', ex - sx) .. 
+                string.rep('f', #buffer.text - ex + 1)
+
+  else
+    buffer.bg = string.rep('f', #buffer.text)
+  end
+
+  term.blit(buffer.text, buffer.fg, buffer.bg)
+end
+
+local function redraw()
+  if dirty.y > 0 then
+    term.setBackgroundColor(color.bgColor)
+    for dy = 1, h do
+
+      local sLine = tLines[dy + scrollY]
+      if sLine ~= nil then
+        if dy + scrollY >= dirty.y and dy + scrollY <= dirty.ey then
+          term.setCursorPos(1 - scrollX, dy)
+          term.clearLine()
+          writeHighlighted(sLine, dy + scrollY)
+        end
+      else
+        term.setCursorPos(1 - scrollX, dy)
+        term.clearLine()
+      end
+    end
+  end
+
+  -- Draw status
+  if #sStatus > 0 then
+    if isError then
+      term.setTextColor(colors.white)
+      term.setBackgroundColor(color.errorBackground)
+    else
+      term.setTextColor(color.highlightColor)
+      term.setBackgroundColor(colors.gray)
+    end
+    term.setCursorPos(1, h)
+    term.clearLine()
+    term.write(string.format(' %s ', sStatus))
+  end
+
+  if not (w < 32 and #sStatus > 0) then
+    local clipboardIndicator = 'S'
+    if clipboard.isInternal() then
+      clipboardIndicator = 'I'
+    end
+
+    local modifiedIndicator = ' '
+    if undo.chain[1] then
+      modifiedIndicator = '*'
+    end
+
+    local str = string.format(' %d:%d %s%s',
+      y, x, clipboardIndicator, modifiedIndicator)
+    term.setTextColor(color.highlightColor)
+    term.setBackgroundColor(colors.gray)
+    term.setCursorPos(w - #str + 1, h)
+    term.write(str)
+  end
+
+  term.setTextColor(color.cursorColor)
+  term.setCursorPos(x - scrollX, y - scrollY)
+
+  dirty.y, dirty.ey = 0, 0
+  if #sStatus > 0 then
+    sStatus = ''
+    dirty.y = scrollY + h
+    dirty.ey = dirty.y
+  end
+  isError = false
+end
+
+local function nextWord(line, cx)
+  local result = { line:find("(%w+)", cx) }
+  if #result > 1 and result[2] > cx then
+    return result[2] + 1
+  elseif #result > 0 and result[1] == cx then
+    result = { line:find("(%w+)", result[2] + 1) }
+    if #result > 0 then
+      return result[1]
+    end
+  end
+end
+
+local function hacky_read()
+  local _oldSetCursorPos = term.setCursorPos
+  local _oldGetCursorPos = term.getCursorPos
+
+  term.setCursorPos = function(x, y)
+    return _oldSetCursorPos(x, h)
+  end
+  term.getCursorPos = function()
+    local x, y = _oldGetCursorPos()
+    return x, 1
+  end
+
+  local s, m = pcall(function() return read() end)
+  term.setCursorPos = _oldSetCursorPos
+  term.getCursorPos = _oldGetCursorPos
+  if s then
+    return m
+  end
+  if m == 'Terminated' then
+    bRunning = false
+  end
+  return ''
+end
+
+local actions
+local __actions = {
+
+  input = function(prompt)
+    term.setTextColor(color.highlightColor)
+    term.setBackgroundColor(colors.gray)
+    term.setCursorPos(1, h)
+    term.clearLine()
+    term.write(prompt)
+    local str = hacky_read()
+    term.setCursorBlink(true)
+    keyboard.shift, keyboard.control = false, false
+    term.setCursorPos(x - scrollX, y - scrollY)
+    actions.dirty_line(scrollY + h)
+    return str
+  end,
+
+  undo = function()
+    local last = table.remove(undo.chain)
+    if last then
+      undo.active = true
+      actions[last.action](unpack(last.args))
+      undo.active = false
+    else
+      setStatus('Already at oldest change')
+    end
+  end,
+
+  addUndo = function(entry)
+    local last = undo.chain[#undo.chain]
+    if last and last.action == entry.action then
+      --[[
+      debug('---')
+      debug(last)
+      debug(last.args)
+      debug(entry)
+      debug(entry.args)
+      ]]--
+      if last.action == 'deleteText' then
+        if last.args[3] == entry.args[1] and
+           last.args[4] == entry.args[2] then
+          last.args = {
+            last.args[1], last.args[2], entry.args[3], entry.args[4],
+            last.args[5] .. entry.args[5]
+          }
+        else
+          table.insert(undo.chain, entry)
+        end
+      else
+        -- insertText (need to finish)
+        table.insert(undo.chain, entry)
+      end
+    else
+      table.insert(undo.chain, entry)
+    end
+  end,
+
+  autocomplete = function()
+    if keyboard.lastAction ~= 'autocomplete' or not complete.results then
+      local sLine = tLines[y]:sub(1, x - 1)
+      local nStartPos = sLine:find("[a-zA-Z0-9_%.]+$")
+      if nStartPos then
+        sLine = sLine:sub(nStartPos)
+      end
+      if #sLine > 0 then
+        complete.results = textutils.complete(sLine)
+      else
+        complete.results = { }
+      end
+      complete.index = 0
+      complete.x = x
+    end
+
+    if #complete.results == 0 then
+      setError('No completions available')
+
+    elseif #complete.results == 1 then
+      actions.insertText(x, y, complete.results[1])
+      complete.results = nil
+
+    elseif #complete.results > 1 then
+      local prefix = complete.results[1]
+      for n = 1, #complete.results do
+        local result = complete.results[n]
+        while #prefix > 0 do
+          if result:find(prefix, 1, true) == 1 then
+            break
+          end
+          prefix = prefix:sub(1, #prefix - 1)
+        end
+      end
+      if #prefix > 0 then
+        actions.insertText(x, y, prefix)
+        complete.results = nil
+      else
+        if complete.index > 0 then
+          actions.deleteText(complete.x, y, complete.x + #complete.results[complete.index], y)
+        end
+        complete.index = complete.index + 1
+        if complete.index > #complete.results then
+          complete.index = 1
+        end
+        actions.insertText(complete.x, y, complete.results[complete.index])
+      end
+    end
+  end,
+
+  refresh = function()
+    actions.dirty_all()
+    mark.continue = mark.active
+    setStatus('refreshed')
+  end,
+
+  menu = function()
+    setStatus(messages.menu)
+    mark.continue = mark.active
+  end,
+
+  goto_line = function()
+    local lineNo = tonumber(actions.input('Line: '))
+    if lineNo then
+      actions.goto(1, lineNo)
+    else
+      setStatus('Invalid line number')
+    end
+  end,
+
+  find = function(pattern, sx)
+    local nLines = #tLines
+    for i = 1, nLines + 1 do
+      local ny = y + i - 1
+      if ny > nLines then
+        ny = ny - nLines
+      end
+      local nx = tLines[ny]:lower():find(pattern, sx)
+      if nx then
+        if ny < y or ny == y and nx <= x then
+          setStatus(messages.wrapped)
+        end
+        actions.goto(nx, ny)
+        actions.mark_to(nx + #pattern, ny)
+        actions.goto(nx, ny)
+        return
+      end
+      sx = 1
+    end
+    setError('Pattern not found')
+  end,
+
+  find_next = function()
+    if searchPattern then
+      actions.unmark()
+      actions.find(searchPattern, x + 1)
+    end
+  end,
+
+  find_prompt = function()
+    local text = actions.input('/')
+    if #text > 0 then
+      searchPattern = text:lower()
+      if searchPattern then
+        actions.unmark()
+        actions.find(searchPattern, x)
+      end
+    end
+  end,
+
+  save = function()
+    if bReadOnly then
+      setError("Access denied")
+    else
+      local ok, err = save(sPath)
+      if ok then
+        setStatus('"%s" %dL, %dC written',
+           fileInfo.path, #tLines, fs.getSize(fileInfo.abspath))
+      else
+        setError("Error saving to %s", sPath)
+      end
+    end
+  end,
+
+  exit = function()
+    bRunning = false
+  end,
+
+  run = function()
+    local sTempPath = "/.temp"
+    local ok, err = save(sTempPath)
+    if ok then
+      local nTask = shell.openTab(sTempPath)
+      if nTask then
+        shell.switchTab(nTask)
+      else
+        setError("Error starting Task")
+      end
+      os.sleep(0)
+      fs.delete(sTempPath)
+    else
+      setError("Error saving to %s", sTempPath)
+    end
+  end,
+
+  status = function()
+    local modified = ''
+    if undo.chain[1] then
+      modified = '[Modified] '
+    end
+    setStatus('"%s" %s%d lines --%d%%--',
+         fileInfo.path, modified, #tLines,
+         math.floor((y - 1) / (#tLines - 1) * 100))
+  end,
+
+  dirty_line = function(dy)
+    if dirty.y == 0 then
+      dirty.y = dy
+      dirty.ey = dy
+    else
+      dirty.y = math.min(dirty.y, dy)
+      dirty.ey = math.max(dirty.ey, dy)
+    end
+  end,
+
+  dirty_range = function(dy, dey)
+    actions.dirty_line(dy)
+    actions.dirty_line(dey or #tLines)
+  end,
+
+  dirty = function()
+    actions.dirty_line(y)
+  end,
+
+  dirty_all = function()
+    actions.dirty_line(1)
+    actions.dirty_line(#tLines)
+  end,
+
+  mark_begin = function()
+    actions.dirty()
+    if not mark.active then
+      mark.active = true
+      mark.anchor = { x = x, y = y }
+    end
+  end,
+
+  mark_finish = function()
+    if y == mark.anchor.y then
+      if x == mark.anchor.x then
+        mark.active = false
+      else
+        mark.x = math.min(mark.anchor.x, x)
+        mark.y = y
+        mark.ex = math.max(mark.anchor.x, x)
+        mark.ey = y
+      end
+    elseif y < mark.anchor.y then
+      mark.x = x
+      mark.y = y
+      mark.ex = mark.anchor.x
+      mark.ey = mark.anchor.y
+    else
+      mark.x = mark.anchor.x
+      mark.y = mark.anchor.y
+      mark.ex = x
+      mark.ey = y
+    end
+    actions.dirty()
+    mark.continue = mark.active
+  end,
+
+  unmark = function()
+    if mark.active then
+      actions.dirty_range(mark.y, mark.ey)
+      mark.active = false
+    end
+  end,
+
+  mark_to = function(nx, ny)
+    actions.mark_begin()
+    actions.goto(nx, ny)
+    actions.mark_finish()
+  end,
+
+  mark_up = function()
+    actions.mark_begin()
+    actions.up()
+    actions.mark_finish()
+  end,
+
+  mark_right = function()
+    actions.mark_begin()
+    actions.right()
+    actions.mark_finish()
+  end,
+
+  mark_down = function()
+    actions.mark_begin()
+    actions.down()
+    actions.mark_finish()
+  end,
+
+  mark_left = function()
+    actions.mark_begin()
+    actions.left()
+    actions.mark_finish()
+  end,
+
+  mark_word = function()
+    actions.mark_begin()
+    actions.word()
+    actions.mark_finish()
+  end,
+
+  mark_backword = function()
+    actions.mark_begin()
+    actions.backword()
+    actions.mark_finish()
+  end,
+
+  mark_home = function()
+    actions.mark_begin()
+    actions.home()
+    actions.mark_finish()
+  end,
+
+  mark_end = function()
+    actions.mark_begin()
+    actions.toend()
+    actions.mark_finish()
+  end,
+
+  mark_all = function()
+    mark.anchor = { x = 1, y = 1 }
+    mark.active = true
+    mark.continue = true
+    mark.x = 1
+    mark.y = 1
+    mark.ey = #tLines
+    mark.ex = #tLines[mark.ey] + 1
+    actions.dirty_all()
+  end,
+
+  setCursor = function(newX, newY)
+    local oldX, oldY = lastPos.x, lastPos.y
+
+    lastPos.x = x
+    lastPos.y = y
+
+    local screenX = x - scrollX
+    local screenY = y - scrollY
+
+    if screenX < 1 then
+      scrollX = x - 1
+      screenX = 1
+      actions.dirty_all()
+    elseif screenX > w then
+      scrollX = x - w
+      screenX = w
+      actions.dirty_all()
+    end
+
+    if screenY < 1 then
+      scrollY = y - 1
+      screenY = 1
+      actions.dirty_all()
+    elseif screenY > h - 1 then
+      scrollY = y - (h - 1)
+      screenY = h - 1
+      actions.dirty_all()
+    end
+  end,
+
+  top = function()
+    actions.goto(1, 1)
+  end,
+
+  bottom = function()
+    y = #tLines
+    x = #tLines[y] + 1
+  end,
+
+  up = function()
+    if y > 1 then
+      x = math.min(x, #tLines[y - 1] + 1)
+      y = y - 1
+    end
+  end,
+
+  down = function()
+    if y < #tLines then
+      x = math.min(x, #tLines[y + 1] + 1)
+      y = y + 1
+    end
+  end,
+
+  tab = function()
+    if mark.active then
+      actions.delete()
+    end
+    actions.insertText(x, y, '  ')
+  end,
+
+  pageUp = function()
+    actions.goto(x, y - (h - 1))
+  end,
+
+  pageDown = function()
+    actions.goto(x, y + (h - 1))
+  end,
+
+  home = function()
+    x = 1
+  end,
+
+  toend = function()
+    x = #tLines[y] + 1
+  end,
+
+  left = function()
+    if x > 1 then
+      x = x - 1
+    elseif y > 1 then
+      x = #tLines[y - 1] + 1
+      y = y - 1
+    else
+      return false
+    end
+    return true
+  end,
+
+  right = function()
+    if x < #tLines[y] + 1 then
+      x = x + 1
+    elseif y < #tLines then
+      x = 1
+      y = y + 1
+    end
+  end,
+
+  word = function()
+    local nx = nextWord(tLines[y], x)
+    if nx then
+      x = nx
+    elseif x < #tLines[y] + 1 then
+      x = #tLines[y] + 1
+    elseif y < #tLines then
+      x = 1
+      y = y + 1
+    end
+  end,
+
+  backword = function()
+    if x == 1 then
+      actions.left()
+    else
+      local sLine = tLines[y]
+      local lx = 1
+      while true do
+        local nx = nextWord(sLine, lx)
+        if not nx or nx >= x then
+          break
+        end
+        lx = nx
+      end
+      if not lx then
+        x = 1
+      else
+        x = lx
+      end
+    end
+  end,
+
+  insertText = function(sx, sy, text)
+    x = sx
+    y = sy
+    local sLine = tLines[y]
+
+    if not text:find('\n') then
+      tLines[y] = sLine:sub(1, x - 1) .. text .. sLine:sub(x)
+      actions.dirty_line(y)
+      x = x + #text
+    else
+      local lines = split(text)
+      local remainder = sLine:sub(x)
+      tLines[y] = sLine:sub(1, x - 1) .. lines[1]
+      actions.dirty_range(y, #tLines + #lines)
+      x = x + #lines[1]
+      for k = 2, #lines do
+        y = y + 1
+        table.insert(tLines, y, lines[k])
+        x = #lines[k] + 1
+      end
+      tLines[y] = tLines[y]:sub(1, x) .. remainder
+    end
+
+    if not undo.active then
+      actions.addUndo(
+        { action = 'deleteText', args = { sx, sy, x, y, text } })
+    end
+  end,
+
+  deleteText = function(sx, sy, ex, ey)
+    x = sx
+    y = sy
+
+    if not undo.active then
+      local text = actions.copyText(sx, sy, ex, ey)
+      actions.addUndo(
+        { action = 'insertText', args = { sx, sy, text } })
+    end
+
+    local front = tLines[sy]:sub(1, sx - 1)
+    local back = tLines[ey]:sub(ex, #tLines[ey])
+    for k = 2, ey - sy + 1 do
+      table.remove(tLines, y + 1)
+    end
+    tLines[y] = front .. back
+    if sy ~= ey then
+      actions.dirty_range(y)
+    else
+      actions.dirty()
+    end
+  end,
+
+  copyText = function(csx, csy, cex, cey)
+    local count = 0
+    local lines = { }
+
+    for y = csy, cey do
+      local line = tLines[y]
+      if line then
+        local x = 1
+        local ex = #line
+        if y == csy then
+          x = csx
+        end
+        if y == cey then
+          ex = cex - 1
+        end
+        local str = line:sub(x, ex)
+        count = count + #str
+        table.insert(lines, str)
+      end
+    end
+    return table.concat(lines, '\n'), count
+  end,
+
+  delete = function()
+    if mark.active then
+      actions.deleteText(mark.x, mark.y, mark.ex, mark.ey)
+    else
+      local nLimit = #tLines[y] + 1
+      if x < nLimit then
+        actions.deleteText(x, y, x + 1, y)
+      elseif y < #tLines then
+        actions.deleteText(x, y, 1, y + 1)
+      end
+    end
+  end,
+
+  backspace = function()
+    if mark.active then
+      actions.delete()
+    elseif actions.left() then
+      actions.delete()
+    end
+  end,
+
+  enter = function()
+    local sLine = tLines[y]
+    local _,spaces = sLine:find("^[ ]+")
+    if not spaces then
+      spaces = 0
+    end
+    spaces = math.min(spaces, x - 1)
+    if mark.active then
+      actions.delete()
+    end
+    actions.insertText(x, y, '\n' .. string.rep(' ', spaces))
+  end,
+
+  char = function(ch)
+    if mark.active then
+      actions.delete()
+    end
+    actions.insertText(x, y, ch)
+  end,
+
+  toggle_clipboard = function()
+    if clipboard.shim then
+      clipboard.setInternal(not clipboard.internal)
+    end
+    if clipboard.isInternal() then
+      setStatus('Using internal clipboard')
+    else
+      setStatus('Using system clipboard')
+    end
+  end,
+
+  copy_marked = function()
+    local text, size = 
+        actions.copyText(mark.x, mark.y, mark.ex, mark.ey)
+    clipboard.setData(text)
+    setStatus('%d chars copied', size)
+    clipboard.useInternal(true)
+  end,
+
+  cut = function()
+    if mark.active then
+      actions.copy_marked()
+      actions.delete()
+    end
+  end,
+
+  copy = function()
+    if mark.active then
+      actions.copy_marked()
+      mark.continue = true
+    end
+  end,
+
+  paste = function(text)
+    if mark.active then
+      actions.delete()
+    end
+    if clipboard.isInternal() then
+      text = clipboard.getText()
+    end
+    if text then
+      actions.insertText(x, y, text)
+      setStatus('%d chars added', #text)
+    else
+      setStatus('Clipboard empty')
+    end
+  end,
+
+  goto = function(cx, cy)
+    y = math.min(math.max(cy, 1), #tLines)
+    x = math.min(math.max(cx, 1), #tLines[y] + 1)
+  end,
+
+  scroll_up = function()
+    if scrollY > 0 then
+      scrollY = scrollY - 1
+      actions.dirty_all()
+    end
+    mark.continue = mark.active
+  end,
+
+  scroll_down = function()
+    local nMaxScroll = #tLines - (h-1)
+    if scrollY < nMaxScroll then
+      scrollY = scrollY + 1
+      actions.dirty_all()
+    end
+    mark.continue = mark.active
+  end,
+}
+
+actions = __actions
+
+-- Actual program functionality begins
+load(sPath)
+
+term.setCursorBlink(true)
+redraw()
+
+if not keyboard then
+  keyboard = { control, shift, combo }
+
+  function keyboard:translate(event, code)
+    if event == 'key' then
+      local ch = keys.getName(code)
+      if ch then
+
+        if code == keys.leftCtrl or code == keys.rightCtrl then
+          self.control = true
+          self.combo = false
+          return
+        end
+
+        if code == keys.leftShift or code == keys.rightShift  then
+          self.shift = true
+          self.combo = false
+          return
+        end
+
+        if self.shift then
+          if #ch > 1 then
+            ch = 'shift-' .. ch
+          elseif self.control then
+            -- will create control-X
+            -- better than shift-control-x
+            ch = ch:upper()
+          end
+          self.combo = true
+        end
+
+        if self.control then
+          ch = 'control-' .. ch
+          self.combo = true
+          -- even return numbers such as
+          -- control-seven
+          return ch
+        end
+
+        -- filter out characters that will be processed in
+        -- the subsequent char event
+        if ch and #ch > 1 and (code < 2 or code > 11) then
+          return ch
+        end
+      end
+
+    elseif event == 'key_up' then
+
+      if code == keys.leftCtrl or code == keys.rightCtrl then
+        self.control = false
+      elseif code == keys.leftShift or code == keys.rightShift then
+        self.shift = false
+      else
+        return
+      end
+
+      -- only send through the shift / control event if it wasn't
+      -- used in combination with another event
+      if not self.combo then
+        return keys.getName(code)
+      end
+
+    elseif event == 'char' then
+      if not self.control then
+        self.combo = true
+        return event
+      end
+
+    elseif event == 'mouse_click' then
+
+      local buttons = { 'mouse_click', 'mouse_rightclick', 'mouse_doubleclick' }
+
+      self.combo = true
+      if self.shift then
+        return 'shift-' .. buttons[code]
+      end
+      return buttons[code]
+
+    elseif event == "mouse_scroll" then
+      local directions = {
+        [ -1 ] = 'scrollUp',
+        [  1 ] = 'scrollDown'
+      }
+      return directions[code]
+
+    elseif event == 'paste' then
+      self.combo = true
+      return event
+
+    elseif event == 'mouse_drag' then
+      return event
+    end
+  end
+end
+
+while bRunning do
+  local sEvent, param, param2, param3 = os.pullEventRaw()
+  local action
+
+  if sEvent == 'terminate' then
+    action = 'exit'
+  elseif sEvent == "mouse_click" or sEvent == 'mouse_drag' then
+    if param3 < h or sEvent == 'mouse_drag' then
+      local ch = keyboard:translate(sEvent, param)
+      if ch then
+        action = keyMapping[ch]
+        param = param2 + scrollX
+        param2 = param3 + scrollY
+      end
+    end
+  else
+    local ch = keyboard:translate(sEvent, param)
+    if ch then
+      action = keyMapping[ch]
+    end
+  end
+
+  if action then
+    if not actions[action] then
+      error('Invaid action: ' .. action)
+    end
+
+    local wasMarking = mark.continue
+    mark.continue = false
+
+    actions[action](param, param2)
+    if action ~= 'menu' then
+      keyboard.lastAction = action
+    end
+
+    if x ~= lastPos.x or y ~= lastPos.y then
+      actions.setCursor()
+    end
+    if not mark.continue and wasMarking then
+      actions.unmark()
+    end
+
+    redraw()
+
+  elseif sEvent == "term_resize" then
+    w,h = term.getSize()
+    actions.setCursor(x, y)
+    actions.dirty_all()
+    redraw()
+  end
+end
+
+-- Cleanup
+term.setBackgroundColor(colors.black)
+term.setTextColor(colors.white)
+term.clear()
+term.setCursorBlink(false)
+term.setCursorPos(1, 1)
diff --git a/etc/scripts/abort b/etc/scripts/abort
new file mode 100644
index 0000000..9fe3f6c
--- /dev/null
+++ b/etc/scripts/abort
@@ -0,0 +1 @@
+turtle.abortAction()
diff --git a/etc/scripts/follow b/etc/scripts/follow
new file mode 100644
index 0000000..769b643
--- /dev/null
+++ b/etc/scripts/follow
@@ -0,0 +1,113 @@
+local function follow(id)
+
+  requireInjector(getfenv(1))
+
+  local Event  = require('event')
+  local Point  = require('point')
+  local Socket = require('socket')
+
+  turtle.status = 'follow ' .. id
+
+  if not turtle.enableGPS() then
+    error('turtle: No GPS found')
+  end
+
+  local socket = Socket.connect(id, 161)
+  if not socket then
+    error('turtle: Unable to connect to ' .. id)
+    return
+  end
+
+  local lastPoint
+  local following = false
+
+  Event.on('turtle_follow', function(_, pt)
+
+    local pts = {
+      { x = pt.x + 2, z = pt.z,     y = pt.y },
+      { x = pt.x - 2, z = pt.z,     y = pt.y },
+      { x = pt.x,     z = pt.z + 2, y = pt.y },
+      { x = pt.x,     z = pt.z - 2, y = pt.y },
+    }
+
+    local cpt = Point.closest(turtle.point, pts)
+
+    local blocks = { }
+
+    local function addBlocks(tpt)
+      table.insert(blocks, tpt)
+      local apts = Point.adjacentPoints(tpt)
+      for _,apt in pairs(apts) do
+        table.insert(blocks, apt)
+      end
+    end
+
+    -- don't run into player
+    addBlocks(pt)
+    addBlocks({ x = pt.x, z = pt.z, y = pt.y + 1 })
+
+    if turtle.pathfind(cpt, { blocks = blocks }) then
+      turtle.headTowards(pt)
+    end
+    following = false
+  end)
+
+  Event.onInterval(.5, function()
+
+    local function getRemotePoint()
+      if not turtle.abort then
+        if socket:write({ type = 'gps' }) then
+          return socket:read(3)
+        end
+      end
+    end
+
+    -- sometimes gps will fail if moving
+    local pt, d
+
+    for i = 1, 3 do
+      pt, d = getRemotePoint()
+      if pt then
+        break
+      end
+      os.sleep(.5)
+    end
+
+    if not pt or turtle.abort then
+      error('Did not receive GPS location')
+    end
+
+    if not lastPoint or (lastPoint.x ~= pt.x or lastPoint.y ~= pt.y or lastPoint.z ~= pt.z) then
+
+      if following then
+        turtle.abort = true
+        while following do
+          os.sleep(.1)
+        end
+        turtle.abort = false
+      end
+
+      -- check if gps is inaccurate (player moving too fast)
+      if d < Point.pythagoreanDistance(turtle.point, pt) + 10 then
+        lastPoint = Point.copy(pt)
+        following = true
+        os.queueEvent('turtle_follow', pt)
+      end
+    end
+  end)
+
+  Event.on('turtle_abort', function()
+    Event.exitPullEvents()
+  end)
+
+  Event.pullEvents()
+
+  socket:close()
+
+  return true
+end
+
+local s, m = turtle.run(function() follow({COMPUTER_ID}) end)
+if not s and m then
+  error(m)
+end
diff --git a/etc/scripts/goHome b/etc/scripts/goHome
new file mode 100644
index 0000000..26681ed
--- /dev/null
+++ b/etc/scripts/goHome
@@ -0,0 +1 @@
+turtle.run(turtle.gotoGPSHome)
diff --git a/etc/scripts/level b/etc/scripts/level
new file mode 100644
index 0000000..8574bc8
--- /dev/null
+++ b/etc/scripts/level
@@ -0,0 +1,85 @@
+requireInjector(getfenv(1))
+
+local Point = require('point')
+local Util  = require('util')
+
+local checkedNodes = { }
+local nodes = { }
+local box = { x = 65, ex = 69, y = 65, ey = 70, z = -23, ez = -19 }
+
+local function inBox(pt, box)
+  return pt.x >= box.x and
+         pt.y >= box.y and
+         pt.z >= box.z and
+         pt.x <= box.ex and
+         pt.y <= box.ey and
+         pt.z <= box.ez
+end
+
+local function toKey(pt)
+  return table.concat({ pt.x, pt.y, pt.z }, ':')
+end
+
+local function addNode(node)
+
+  for i = 0, 5 do
+    local hi = turtle.getHeadingInfo(i)
+    local testNode = { x = node.x + hi.xd, y = node.y + hi.yd, z = node.z + hi.zd }
+
+    if inBox(testNode, box) then
+      local key = toKey(testNode)
+      if not checkedNodes[key] then
+        nodes[key] = testNode
+      end
+    end
+  end
+end
+
+local function dig(facing)
+  local direction = facing
+  if direction == 'forward' then
+    direction = turtle.getHeadingInfo(turtle.point.heading).direction
+  end
+  local hi = turtle.getHeadingInfo(direction)
+  local node = { x = turtle.point.x + hi.xd, y = turtle.point.y + hi.yd, z = turtle.point.z + hi.zd }
+  if inBox(node, box) then
+    if turtle.getAction(facing).dig() then
+      addNode(node)
+    end
+  end
+end
+
+local function level()
+  repeat
+    local node = { x = turtle.point.x, y = turtle.point.y, z = turtle.point.z }
+    local key = toKey(node)
+
+    checkedNodes[key] = true
+    nodes[key] = nil
+
+    dig('down')
+    dig('up')
+    dig('forward')
+
+    print(string.format('%d nodes remaining', Util.size(nodes)))
+
+    if Util.size(nodes) == 0 then
+      break
+    end
+
+    local node = Point.closest(turtle.point, nodes)
+    if not turtle.gotoPoint(node) then
+      break
+    end
+  until turtle.abort
+end
+
+local pt = Util.shallowCopy(turtle.point)
+turtle.setPolicy(turtle.policies.none)
+if turtle.pathfind({ x = 65, y = 70, z = -23 }) then
+--turtle.reset()
+  turtle.setPolicy(turtle.policies.digOnly)
+  level()
+end
+turtle.pathfind(pt)
+--local s, m = turtle.run(level)
diff --git a/etc/scripts/moveTo b/etc/scripts/moveTo
new file mode 100644
index 0000000..deb7be5
--- /dev/null
+++ b/etc/scripts/moveTo
@@ -0,0 +1,29 @@
+turtle.run(function()
+
+  requireInjector(getfenv(1))
+
+  local GPS    = require('gps')
+  local Socket = require('socket')
+
+  local id = {COMPUTER_ID}
+
+  if not turtle.enableGPS() then
+    error('turtle: No GPS found')
+  end
+
+  local socket = Socket.connect(id, 161)
+  if not socket then
+    error('turtle: Unable to connect to ' .. id)
+  end
+
+  socket:write({ type = 'gps' })
+
+  local pt = socket:read(3)
+  if not pt then
+    error('turtle: No GPS response')
+  end
+
+  if not turtle.pathfind(pt) then
+    error('Unable to go to location')
+  end
+end)
diff --git a/etc/scripts/obsidian b/etc/scripts/obsidian
new file mode 100644
index 0000000..2695af1
--- /dev/null
+++ b/etc/scripts/obsidian
@@ -0,0 +1,102 @@
+requireInjector(getfenv(1))
+
+local Point = require('point')
+local Util  = require('util')
+
+local checkedNodes, nodes
+
+local function addNode(node)
+
+  for i = 0, 3 do
+    local hi = turtle.getHeadingInfo(i)
+    local testNode = { x = node.x + hi.xd, z = node.z + hi.zd }
+
+    local key = table.concat({ testNode.x, testNode.z }, ':')
+    if not checkedNodes[key] then
+      nodes[key] = testNode
+    end
+  end
+end
+
+local function findObsidian()
+  repeat
+    local node = { x = turtle.point.x, z = turtle.point.z }
+    local key = table.concat({ node.x, node.z }, ':')
+
+    checkedNodes[key] = true
+    nodes[key] = nil
+
+    local _,b = turtle.inspectDown()
+    if b and (b.name == 'minecraft:lava' or b.name == 'minecraft:flowing_lava') then
+      if turtle.select('minecraft:water_bucket') then
+        while true do
+          if turtle.up() then
+            break
+          end
+          print('stuck')
+        end
+        turtle.placeDown()
+        os.sleep(2)
+        turtle.placeDown()
+        turtle.down()
+        turtle.select(1)
+        _, b = turtle.inspectDown()
+      end
+    end
+
+    if turtle.getCount(16) > 0 then
+      print('Inventory full')
+      print('Enter to continue...')
+      read()
+    end
+
+    if b and b.name == 'minecraft:obsidian' then
+      turtle.digDown()
+      addNode(node)
+    else
+      turtle.digDown()
+    end
+
+    print(string.format('%d nodes remaining', Util.size(nodes)))
+
+    if Util.size(nodes) == 0 then
+      break
+    end
+
+    local node = Point.closest(turtle.point, nodes)
+    if not turtle.gotoPoint(node) then
+      break
+    end
+  until turtle.abort
+end
+
+turtle.reset()
+turtle.setPolicy(turtle.policies.digOnly)
+local s, m = turtle.run(function() 
+  repeat
+
+    checkedNodes = { }
+    nodes = { }
+
+    local _,b = turtle.inspectDown()
+    if not b or b.name ~= 'minecraft:obsidian' then
+      break
+    end
+
+    findObsidian()
+    if not turtle.select('minecraft:water_bucket') then
+      break
+    end
+    turtle.goto(0, 0)
+    turtle.placeDown()
+    os.sleep(2)
+    turtle.placeDown()
+    turtle.down()
+    turtle.select(1)
+  until turtle.abort
+end)
+turtle.goto(0, 0, 0, 0)
+turtle.reset()
+if not s and m then
+  error(m)
+end
diff --git a/etc/scripts/reboot b/etc/scripts/reboot
new file mode 100644
index 0000000..8134cfd
--- /dev/null
+++ b/etc/scripts/reboot
@@ -0,0 +1 @@
+os.reboot()
\ No newline at end of file
diff --git a/etc/scripts/setHome b/etc/scripts/setHome
new file mode 100644
index 0000000..fe4ed90
--- /dev/null
+++ b/etc/scripts/setHome
@@ -0,0 +1 @@
+turtle.run(turtle.setGPSHome)
diff --git a/etc/scripts/shutdown b/etc/scripts/shutdown
new file mode 100644
index 0000000..fbb0bdb
--- /dev/null
+++ b/etc/scripts/shutdown
@@ -0,0 +1 @@
+os.shutdown()
\ No newline at end of file
diff --git a/etc/scripts/summon b/etc/scripts/summon
new file mode 100644
index 0000000..e841622
--- /dev/null
+++ b/etc/scripts/summon
@@ -0,0 +1,74 @@
+local function summon(id)
+
+  requireInjector(getfenv(1))
+
+  local GPS    = require('gps')
+  local Point  = require('point')
+  local Socket = require('socket')
+
+  turtle.status = 'GPSing'
+  turtle.setPoint({ x = 0, y = 0, z = 0, heading = 0 })
+
+  local pts = {
+    [ 1 ] = { x = 0, z = 0, y = 0 },
+    [ 2 ] = { x = 4, z = 0, y = 0 },
+    [ 3 ] = { x = 2, z = -2, y = 2 },
+    [ 4 ] = { x = 2, z = 2, y = 2 },
+  }
+  local tFixes = { }
+
+  local socket = Socket.connect(id, 161)
+
+  if not socket then
+    error('turtle: Unable to connect to ' .. id)
+  end
+
+  local function getDistance()
+    socket:write({ type = 'ping' })
+    local _, d = socket:read(5)
+    return d
+  end
+
+  local function doGPS()
+    tFixes = { }
+    for i = 1, 4 do
+      if not turtle.gotoPoint(pts[i]) then
+        error('turtle: Unable to perform GPS maneuver')
+      end
+      local distance = getDistance()
+      if not distance then
+        error('turtle: No response from ' .. id)
+      end
+      table.insert(tFixes, {
+        position = vector.new(turtle.point.x, turtle.point.y, turtle.point.z),
+        distance = distance
+      })
+    end
+    return true
+  end
+
+  if not doGPS() then
+    turtle.turnAround()
+    turtle.setPoint({ x = 0, y = 0, z = 0, heading = 0})
+    if not doGPS() then
+      socket:close()
+      return false
+    end
+  end
+
+  socket:close()
+
+  local pos = GPS.trilaterate(tFixes)
+
+  if pos then
+    local pt = { x = pos.x, y = pos.y, z = pos.z }
+    local _, h = Point.calculateMoves(turtle.getPoint(), pt)
+    local hi = turtle.getHeadingInfo(h)
+    turtle.status = 'recalling'
+    turtle.pathfind({ x = pt.x - hi.xd, z = pt.z - hi.zd, y = pt.y - hi.yd, heading = h })
+  else
+    error("turtle: Could not determine position")
+  end
+end
+
+turtle.run(function() summon({COMPUTER_ID}) end)
diff --git a/etc/scripts/update b/etc/scripts/update
new file mode 100644
index 0000000..484beb1
--- /dev/null
+++ b/etc/scripts/update
@@ -0,0 +1 @@
+shell.run('/apps/update.lua')