ChanServ - WIP Commit 2