diff --git a/mosh.conf b/Mosh.conf
similarity index 100%
rename from mosh.conf
rename to Mosh.conf
diff --git a/mosh.pl b/Mosh.pl
similarity index 100%
rename from mosh.pl
rename to Mosh.pl
diff --git a/docs/VERSION.txt b/docs/VERSION.txt
index 38a80a3..7582454 100644
--- a/docs/VERSION.txt
+++ b/docs/VERSION.txt
@@ -1,6 +1,8 @@
 0.7
 --
 
+* Milkbone::Hooks works
+* Net-Demo mostly working
 * Fixed a random typing notifications bug that appeared out of nowhere
 * Temporarily fixed the fatal chat invitation bug
 * Finally got around to changing milkbone.batkins.com to milkbone.org in the default profile
@@ -28,7 +30,7 @@
 * More font-tweaking
 * Fixed the %a - %s bug (thanks Dan)
 * A little more cleaning in XAMP
-* Bugs in convo-flashing fixe
+* Bugs in convo-flashing fixed
 * Beta Makefile
 * Beta ebuild (for Gentoo Linux users)
 * No more extraneous warnings on startup (well maybe one or two)
diff --git a/lib/Milkbone/Hooks.pm b/lib/Milkbone/Hooks.pm
new file mode 100644
index 0000000..9431d6e
--- /dev/null
+++ b/lib/Milkbone/Hooks.pm
@@ -0,0 +1,28 @@
+package Milkbone::Hooks;
+
+use strict;
+no strict 'refs';
+use warnings;
+
+use Milkbone;
+
+# import is the only function in the Milkbone::Hooks package.  The import list
+# passed to it specifies which hooks should be given aliases in the calling
+# package.  For instance, suppose the following statement exists in package foo
+#
+#     use Milkbone::Hooks qw(load_options);
+#
+# Then load_options() will be an alias for hook("load_options") in package
+# foo.
+
+sub import
+{
+  my $caller = caller;
+  my $package = shift;
+
+  foreach my $hook (@_) {
+    *{$caller . '::' . $hook} = sub { hook($hook); };
+  }
+}
+
+1;
diff --git a/mb.conf b/mb.conf
index ac61980..77e7f4a 100644
--- a/mb.conf
+++ b/mb.conf
@@ -1,8 +1,8 @@
 # mb.conf - milkbone global configuration file
 
 Goodbye sorry, gotta, go
-Modules Tk-PluginsConf, Net-OSCAR, Tk-GUI, Tk-Logon, Tk-BList, Tk-Profile, Tk-File, Tk-About, Tk-Convo, Tk-Conf, Tk-AddBuddy
-Plugins XAMP, Monitor, Counterstrike, Win32-Tray, Log
+Modules Tk-PluginsConf, Net-Demo, Tk-GUI, Tk-Logon, Tk-BList, Tk-Profile, Tk-File, Tk-About, Tk-Convo, Tk-Conf, Tk-AddBuddy
+Plugins XAMP, Monitor, Counterstrike
 Port 5190
 HeavyLogging 0
 SoundsWhileAway 0
diff --git a/mos.pl b/mos.pl
index 15f5827..f5c8a27 100755
--- a/mos.pl
+++ b/mos.pl
@@ -22,6 +22,8 @@ use Tk;
 $SIG{CHLD} = 'IGNORE';		# this is so forked processes don't become zombies
 
 use Milkbone;
+use Milkbone::Hooks qw(load_options pre_mainloop post_mainloop 
+		       protocol_signon load_plugins);
 
 $| = 1;
 
@@ -29,18 +31,19 @@ sub main
 {
     Milkbone->init();
 
-    hook("load_options");
+    load_options;
 
     require "plugins/Tk-Splash.pl" unless option("NoSplash");
 
-    hook("load_plugins");
-    hook("pre_mainloop");
+    load_plugins;
+    pre_mainloop;
 
-    hook("create_logon_prompt");
+    protocol_signon -user => 'test', -pass => 'test';
+    data("me") = "test";
 
     MOSLoop;
 
-    hook("post_mainloop");
+    post_mainloop;
 }
 
 # off it goes...
diff --git a/mosh b/mosh
deleted file mode 100755
index 7d4fbba..0000000
--- a/mosh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd $HOME/milkbone
-perl mosh.pl
\ No newline at end of file
diff --git a/plugins/Net-Demo.pl b/plugins/Net-Demo.pl
index 69490bd..1ff09b1 100644
--- a/plugins/Net-Demo.pl
+++ b/plugins/Net-Demo.pl
@@ -12,18 +12,36 @@ register_hook "protocol_signon", sub {
 		$ARGS{-buddy}, -group => $ARGS{-group}); };
 
 	register_hook "protocol_get_groups", sub { return ["Buddies", "You"] };
-	register_hook "protocol_get_realname", sub { return uc $ARGS{-user} };
+	register_hook "protocol_get_realname", sub { return lc $ARGS{-user} };
 	register_hook "protocol_request_info", sub {
-		hook("protocol_info_received_$ARGS{-user}",
-			-profile => 'test', -away => 'test');
+		hook("after", -time => 1000, -code => sub {
+		       hook("protocol_info_received_$ARGS{-user}",
+			    -profile => 'test', -away => 'test');
+		       });
 	};
+
+	register_hook "protocol_send_im", sub {
+	  hook("after", -time => 500, -code => [sub {
+		 hook("msg_sent_$_[0]", -user => $_[0],  -msg => $_[1], -away => 0);
+		 hook("after", -time => 500, sub {
+			hook("msg_in", -user => $_[0], -msg => $_[1], -away => 0);
+			hook("msg_in_$_[0]", -user => $_[0], -msg => $_[1], -away => 0);
+			});
+	  }, $ARGS{-dest}, $ARGS{-msg}]);
+	};
+	register_hook "protocol_away_status", sub { 0 };
 		
 	hook("after", -time => 1000, -code => sub {
-		hook("buddy_in", -group => 'Buddies', -buddy => $_); })
-		for qw(althor57 perlmonk86);
+		hook("buddy_in", -group => 'Buddies', -buddy => 'test_user');
+	});
+
 	hook("after", -time => 1000, -code => sub {
 		hook("msg_in", -user => 'thatguy', -msg => '<b>hey</b>');
 	});
+
+	hook("after", -time => 1500, -code => sub {
+		hook("protocol_send_im", -dest => 'thatguy', -msg => '<b>hey there</b>');
+	});
 };
 
 1;
diff --git a/plugins/Tk-Convo/Milkbone/Convo.pm b/plugins/Tk-Convo/Milkbone/Convo.pm
index 0237c8a..5ea97fa 100644
--- a/plugins/Tk-Convo/Milkbone/Convo.pm
+++ b/plugins/Tk-Convo/Milkbone/Convo.pm
@@ -1,3 +1,4 @@
+
 # milkbone - conversation window
 
 package Milkbone::Convo;
diff --git a/plugins/Tk-Convo/Tk-Convo.pl b/plugins/Tk-Convo/Tk-Convo.pl
index 9c32b15..176f22c 100644
--- a/plugins/Tk-Convo/Tk-Convo.pl
+++ b/plugins/Tk-Convo/Tk-Convo.pl
@@ -27,7 +27,7 @@ register_hook("create_convo", sub {
     register_hook("msg_in_$buddy", sub {
         if(!$convos{$ARGS{-user}})
         {
-            hook("create_convo", -user => hook("protocol_get_realname", -user => $ARGS{-user}));
+            hook("create_convo", -user => $ARGS{-user});
         }
         $convos{$ARGS{-user}}->{convo}->on_receive(@ARGS{-from, -msg, -away});
         hook("flash_window", -wnd => $convo);
@@ -57,7 +57,6 @@ register_hook("create_convo", sub {
 });
 
 register_hook("remove_convo", sub {
-    
     deregister_hook("msg_in_$ARGS{-user}");
     deregister_hook("buddy_in_$ARGS{-user}");
     deregister_hook("buddy_out_$ARGS{-user}");