1 files changed, 9 insertions, 7 deletions

diff --git a/Channel.py b/Channel.py
index 8af00d2..01b266d 100644
--- a/Channel.py
+++ b/Channel.py
@@ -3,20 +3,20 @@ class Channel():
     def __init__(self):
         self.name = ""
         self.topic = ""
-        self.users = list()
+        self.users = {}
         self.modes = list()
 
     def __init__(self, name, topic, userlist, modes):
         self.name = name
         self.topic = topic
         users = userlist.split(" ")
-        self.users = list(users)
+        self.users = {}
         self.modes = list()
 
     def __init__(self, name):
         self.name = name
         self.topic = ""
-        self.users = list()
+        self.users = {}
         self.modes = list()
 
     def get_name(self):
@@ -35,13 +35,15 @@ class Channel():
         return self.users
 
     def set_users(self, users):
-        self.users = users
+        for user in users:
+            self.users[user.get_nick()] = user
 
     def add_user(self, user):
-        self.users.append(user)
+        self.users[user.get_nick()] = user
 
-    def remove_user(self, user):
-        self.users.remove(user)
+    def remove_user(self, nick):
+        del(self.users[nick])
+        # self.users.remove(user)
 
     def get_view(self):
         return self.view