diff --git a/events.go b/events.go
index 6bdc028..824d97a 100644
--- a/events.go
+++ b/events.go
@@ -8,145 +8,14 @@
 
 package termui
 
+import (
+	"strings"
+
+	"github.com/nsf/termbox-go"
+)
+
 //import "github.com/nsf/termbox-go"
 
-/***********************************termbox-go**************************************/
-/*
-type (
-	EventType uint8
-	Modifier  uint8
-	Key       uint16
-)
-
-// This type represents a termbox event. The 'Mod', 'Key' and 'Ch' fields are
-// valid if 'Type' is EventKey. The 'Width' and 'Height' fields are valid if
-// 'Type' is EventResize. The 'Err' field is valid if 'Type' is EventError.
-type Event struct {
-	Type   EventType // one of Event* constants
-	Mod    Modifier  // one of Mod* constants or 0
-	Key    Key       // one of Key* constants, invalid if 'Ch' is not 0
-	Ch     rune      // a unicode character
-	Width  int       // width of the screen
-	Height int       // height of the screen
-	Err    error     // error in case if input failed
-	MouseX int       // x coord of mouse
-	MouseY int       // y coord of mouse
-	N      int       // number of bytes written when getting a raw event
-}
-
-const (
-	KeyF1 Key = 0xFFFF - iota
-	KeyF2
-	KeyF3
-	KeyF4
-	KeyF5
-	KeyF6
-	KeyF7
-	KeyF8
-	KeyF9
-	KeyF10
-	KeyF11
-	KeyF12
-	KeyInsert
-	KeyDelete
-	KeyHome
-	KeyEnd
-	KeyPgup
-	KeyPgdn
-	KeyArrowUp
-	KeyArrowDown
-	KeyArrowLeft
-	KeyArrowRight
-	key_min // see terminfo
-	MouseLeft
-	MouseMiddle
-	MouseRight
-)
-
-const (
-	KeyCtrlTilde      Key = 0x00
-	KeyCtrl2          Key = 0x00
-	KeyCtrlSpace      Key = 0x00
-	KeyCtrlA          Key = 0x01
-	KeyCtrlB          Key = 0x02
-	KeyCtrlC          Key = 0x03
-	KeyCtrlD          Key = 0x04
-	KeyCtrlE          Key = 0x05
-	KeyCtrlF          Key = 0x06
-	KeyCtrlG          Key = 0x07
-	KeyBackspace      Key = 0x08
-	KeyCtrlH          Key = 0x08
-	KeyTab            Key = 0x09
-	KeyCtrlI          Key = 0x09
-	KeyCtrlJ          Key = 0x0A
-	KeyCtrlK          Key = 0x0B
-	KeyCtrlL          Key = 0x0C
-	KeyEnter          Key = 0x0D
-	KeyCtrlM          Key = 0x0D
-	KeyCtrlN          Key = 0x0E
-	KeyCtrlO          Key = 0x0F
-	KeyCtrlP          Key = 0x10
-	KeyCtrlQ          Key = 0x11
-	KeyCtrlR          Key = 0x12
-	KeyCtrlS          Key = 0x13
-	KeyCtrlT          Key = 0x14
-	KeyCtrlU          Key = 0x15
-	KeyCtrlV          Key = 0x16
-	KeyCtrlW          Key = 0x17
-	KeyCtrlX          Key = 0x18
-	KeyCtrlY          Key = 0x19
-	KeyCtrlZ          Key = 0x1A
-	KeyEsc            Key = 0x1B
-	KeyCtrlLsqBracket Key = 0x1B
-	KeyCtrl3          Key = 0x1B
-	KeyCtrl4          Key = 0x1C
-	KeyCtrlBackslash  Key = 0x1C
-	KeyCtrl5          Key = 0x1D
-	KeyCtrlRsqBracket Key = 0x1D
-	KeyCtrl6          Key = 0x1E
-	KeyCtrl7          Key = 0x1F
-	KeyCtrlSlash      Key = 0x1F
-	KeyCtrlUnderscore Key = 0x1F
-	KeySpace          Key = 0x20
-	KeyBackspace2     Key = 0x7F
-	KeyCtrl8          Key = 0x7F
-)
-
-// Alt modifier constant, see Event.Mod field and SetInputMode function.
-const (
-	ModAlt Modifier = 0x01
-)
-
-// Event type. See Event.Type field.
-const (
-	EventKey EventType = iota
-	EventResize
-	EventMouse
-	EventError
-	EventInterrupt
-	EventRaw
-	EventNone
-)
-*/
-/**************************************end**************************************/
-/*
-// convert termbox.Event to termui.Event
-func uiEvt(e termbox.Event) Event {
-	event := Event{}
-	event.Type = EventType(e.Type)
-	event.Mod = Modifier(e.Mod)
-	event.Key = Key(e.Key)
-	event.Ch = e.Ch
-	event.Width = e.Width
-	event.Height = e.Height
-	event.Err = e.Err
-	event.MouseX = e.MouseX
-	event.MouseY = e.MouseY
-	event.N = e.N
-
-	return event
-}
-
 var evtChs = make([]chan Event, 0)
 
 // EventCh returns an output-only event channel.
@@ -171,13 +40,14 @@ func evtListen() {
 		}
 	}()
 }
-*/
+
 type Event struct {
-	Type  string
-	Uri   string
-	Data  interface{}
-	Time  int
-	Refer string
+	Type string
+	Uri  string
+	From string
+	To   string
+	Data interface{}
+	Time int
 }
 
 type evtCtl struct {
@@ -190,8 +60,10 @@ type evtCtl struct {
 
 //
 type EvtStream struct {
-	srcMap map[string]evtCtl
-	stream chan Event
+	srcMap   map[string]Event
+	stream   chan Event
+	cache    map[string][]func(Event)
+	Handlers map[string]func(Event)
 }
 
 func newEvtCtl() evtCtl {
@@ -206,11 +78,41 @@ func newEvtCtl() evtCtl {
 
 func NewEvtStream() EvtStream {
 	return EvtStream{
-		srcMap: make(map[string]evtCtl),
+		srcMap: make(map[string]Event),
 		stream: make(chan Event),
 	}
 }
 
+// a: /sys/bell
+// b: /sys
+// score: 1
+//
+// a: /sys
+// b: /usr
+// score: -1
+//
+// a: /sys
+// b: /
+// score: 0
+func MatchScore(a, b string) int {
+	sa := strings.Split(a, "/")
+	sb := strings.Split(b, "/")
+
+	score := -1
+	for i, s := range sa {
+		if i >= len(sb) {
+			break
+		}
+
+		if s != sb[i] {
+			return -1
+		}
+		score++
+	}
+
+	return score
+}
+
 /*
 func (es *EvtStream) hookup() {