diff --git a/.bot.cfg b/.bot.cfg
index 83a9184..18d70f6 100644
--- a/.bot.cfg
+++ b/.bot.cfg
@@ -1,46 +1,74 @@
-NICK elizabot2
-USER elizabot2 elizabot2 elizabot2 : elizabot2
+NICK oontvoo_bot
+USER oontvoo_bot oontvoo_bot oontvoo_bot : oontvoo_bot
 JOIN #interns
-PONG :3D818075
+PONG :CB08BBEE
 JOIN #interns
-PRIVMSG #interns :Vy: The available modules I have are:
-PRIVMSG #interns :Vy: ping talk~ help eliza_java.jar rps talk output~ output args
-PRIVMSG '#interns' :'Vy': 'bye'
-PRIVMSG #interns :Vy: bye
-PRIVMSG #interns :Vy: Bye again!
+PRIVMSG #interns :Vy: Vy #interns args test 1 2 3
+PRIVMSG #interns :Vy: Hello there!  Please state your problem.
+PRIVMSG #interns :Vy: Don't you really have a problem  ?
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+PRIVMSG #interns :Vy: You say talk but you do have a problem  ?
+PRIVMSG #interns :tedmeyer: You say talk but you do have a problem  ?
+PRIVMSG #interns :Vy: Bonjour, comment vas-tu? Qu'est-ce qui t'amène?
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+MODE #interns +o oontvoo_bot_test
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+MODE #interns +o gaspard
+MODE #interns +o Tucker
+MODE #interns +o dschneider
+PONG :irc.tripadvisor.com
+MODE #interns +o jroseman
+PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
 PRIVMSG #interns :Vy: The available modules I have are:
-PRIVMSG #interns :Vy: ping talk~ help eliza_java.jar rps talk output~ output args
-PRIVMSG #interns :Vy: Hi
-PRIVMSG #interns :Vy: Hi
+PRIVMSG #interns :Vy: ping help rps talk args
 PONG :irc.tripadvisor.com
+MODE #interns +o bsantosh1
+MODE #interns +o bashbot
 PRIVMSG #interns :Vy: The available modules I have are:
-PRIVMSG #interns :Vy: ping talk~ help eliza_java.jar rps talk output~ output args
-PRIVMSG #interns :Vy: 
+PRIVMSG #interns :Vy: ping help rps talk args
+PRIVMSG Vy :Vy: 
+PRIVMSG Vy :Vy: That was a joke! It's free to talk to me. But we do accept donations! ;D
+PRIVMSG Vy :Vy: 
+PRIVMSG Vy :Vy: That was a joke! It's free to talk to me. But we do accept donations! ;D
+PONG :irc.tripadvisor.com
 PRIVMSG #interns :Vy: I'm not sure I understand you fully.
-PRIVMSG #interns :Vy: The available modules I have are:
-PRIVMSG #interns :Vy: ping talk~ help eliza_java.jar rps talk output args
-PRIVMSG #interns :Vy: Hi.  What seems to be your problem ?
-PRIVMSG #interns :Vy: How do you do.  Please state your problem.
-PRIVMSG #interns :Vy: Are you saying no just to be negative?
-PRIVMSG greg :greg: Are you saying no just to be negative?
-PRIVMSG greg :greg: Are you saying no just to be negative?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Do you feel strongly about discussing such things ?
-PRIVMSG greg :greg: Please go on.
-PRIVMSG greg :greg: Please go on.
-PRIVMSG greg :greg: Please go on.
-PRIVMSG greg :greg: Please go on.
-PRIVMSG #interns :Vy: Nice talking to you!  My secretary will send you the bill! 
-PRIVMSG greg :greg: Nice talking to you!  My secretary will send you the bill! 
-PRIVMSG greg :greg: Nice talking to you!  My secretary will send you the bill! 
+PRIVMSG #interns :Vy: Please go on.
+PRIVMSG #interns :tedmeyer: Do computers worry you?
+PRIVMSG #interns :tedmeyer: You seem to be quite positive.
+PRIVMSG #interns :tedmeyer: Are you saying no just to be negative?
+MODE #interns +o andrew
+PRIVMSG #interns :tedmeyer: What makes you think I am going to make you cry  ?
+PRIVMSG #interns :tedmeyer: I'm not sure I understand you fully.
+PRIVMSG #interns :tedmeyer: Why do you ask ?
+PRIVMSG #interns :mlee: The available modules I have are:
+PRIVMSG #interns :mlee: ping help rps talk args
+PRIVMSG #interns :mlee: You believe I can do math  don't you ?
+PRIVMSG #interns :mlee: You seem to be quite positive.
+PRIVMSG #interns :mlee: Why do you think I seem to have talked you ?
+PRIVMSG #interns :mlee: You say you think  ?
+PRIVMSG #interns :mlee: I'm not sure I understand you fully.
+PRIVMSG #interns :plant: I'm not sure I understand you fully.
+PRIVMSG #interns :plant: Is it because you are not sure I fully understand you  that you came to me ?
+PRIVMSG #interns :plant: The available modules I have are:
+PRIVMSG #interns :plant: ping help rps talk args
+PRIVMSG #interns :plant: Why do you ask ?
+MODE #interns +o jdraper
+PRIVMSG #interns :plant: Does that question interest you ?
+PRIVMSG #interns :plant: The available modules I have are:
+PRIVMSG #interns :plant: ping help rps talk args
+MODE #interns +o buttbot
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
+PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
 PONG :irc.tripadvisor.com
-PONG :card.freenode.net
diff --git a/.gitignore~ b/.gitignore~
new file mode 100644
index 0000000..ca0235c
--- /dev/null
+++ b/.gitignore~
@@ -0,0 +1 @@
+modules/talk
\ No newline at end of file
diff --git a/eliza_bot/eliza_java.jar b/eliza_bot/eliza_java.jar
deleted file mode 100644
index 12e89c3..0000000
Binary files a/eliza_bot/eliza_java.jar and /dev/null differ
diff --git a/modules/talk/Vy/input b/modules/talk/Vy/input
deleted file mode 100644
index c1514ab..0000000
--- a/modules/talk/Vy/input
+++ /dev/null
@@ -1,2 +0,0 @@
-talk test
-talk bye
diff --git a/modules/talk/Vy/output b/modules/talk/Vy/output
deleted file mode 100644
index 37cb974..0000000
--- a/modules/talk/Vy/output
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello, how's it going?  Please tell me your problem.
-I'm not sure I understand you fully.
-Please go on.
diff --git a/modules/talk/mlee/input b/modules/talk/mlee/input
deleted file mode 100644
index b85a01e..0000000
--- a/modules/talk/mlee/input
+++ /dev/null
@@ -1,5 +0,0 @@
-so can you do math?
-yes but can you?
-you seem to have talked me into a corner
-i think... you seem... errrrr
-indeed
diff --git a/modules/talk/mlee/output b/modules/talk/mlee/output
deleted file mode 100644
index 2eebe98..0000000
--- a/modules/talk/mlee/output
+++ /dev/null
@@ -1,6 +0,0 @@
-Hello, how's it going?  Please tell me your problem.
-You believe I can do math  don't you ?
-You seem to be quite positive.
-Why do you think I seem to have talked you ?
-You say you think  ?
-I'm not sure I understand you fully.
diff --git a/modules/talk/plant/input b/modules/talk/plant/input
deleted file mode 100644
index ef66fcc..0000000
--- a/modules/talk/plant/input
+++ /dev/null
@@ -1,4 +0,0 @@
-WWWWWWWAAAAAAAZZZZZZZAAAAAAA
-I'm not sure you fully understand me
-how did you know?
-Why wouldn't I ask
diff --git a/modules/talk/plant/output b/modules/talk/plant/output
deleted file mode 100644
index a103e0f..0000000
--- a/modules/talk/plant/output
+++ /dev/null
@@ -1,5 +0,0 @@
-Hello, how's it going?  Please tell me your problem.
-I'm not sure I understand you fully.
-Is it because you are not sure I fully understand you  that you came to me ?
-Why do you ask ?
-Does that question interest you ?
diff --git a/modules/talk/tedmeyer/input b/modules/talk/tedmeyer/input
deleted file mode 100644
index 223142d..0000000
--- a/modules/talk/tedmeyer/input
+++ /dev/null
@@ -1,6 +0,0 @@
-talk you are an evil sentient computer
-talk yes, especially sentient ones
-no, YOURE possitive
-you're going to make me cry
-abcdefg
-what is the square root of two?
diff --git a/modules/talk/tedmeyer/output b/modules/talk/tedmeyer/output
deleted file mode 100644
index cb528aa..0000000
--- a/modules/talk/tedmeyer/output
+++ /dev/null
@@ -1,7 +0,0 @@
-Hello, how's it going?  Please tell me your problem.
-Do computers worry you?
-You seem to be quite positive.
-Are you saying no just to be negative?
-What makes you think I am going to make you cry  ?
-I'm not sure I understand you fully.
-Why do you ask ?