diff --git a/Modules.cpp b/Modules.cpp
index a719d7ca..dc0314e6 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -104,6 +104,42 @@ CModule* CTimer::GetModule() const { return m_pModule; }
 const CString& CTimer::GetDescription() const { return m_sDescription; }
 /////////////////// !Timer ///////////////////
 
+/////////////////// Socket ///////////////////
+CSocket::CSocket(CModule* pModule, const CString& sLabel) : Csock() {
+	m_pModule = pModule;
+	m_sLabel = sLabel;
+	m_pModule->AddSocket(this);
+	EnableReadLine();
+}
+
+CSocket::CSocket(CModule* pModule, const CString& sLabel, const CString& sHostname, unsigned short uPort, int iTimeout) : Csock(sHostname, uPort, iTimeout) {
+	m_pModule = pModule;
+	m_sLabel = sLabel;
+	m_pModule->AddSocket(this);
+	EnableReadLine();
+}
+
+CSocket::~CSocket() {
+	m_pModule->UnlinkSocket(this);
+}
+
+bool CSocket::Connect(const CString& sHostname, unsigned short uPort, bool bSSL, unsigned int uTimeout) {
+	CString sSockName = "MOD::C::" + m_pModule->GetModName() + "::" + m_pModule->GetUser()->GetUserName();
+	return m_pModule->GetManager()->Connect(sHostname, uPort, sSockName, uTimeout, false, m_pModule->GetUser()->GetVHost(), (Csock*) this);
+}
+
+bool CSocket::Listen(unsigned short uPort, bool bSSL, unsigned int uTimeout) {
+	CString sSockName = "MOD::L::" + m_pModule->GetModName() + "::" + m_pModule->GetUser()->GetUserName();
+	return m_pModule->GetManager()->ListenAll(uPort, sSockName, bSSL, SOMAXCONN, (Csock*) this);
+}
+
+void CSocket::SetModule(CModule* p) { m_pModule = p; }
+void CSocket::SetLabel(const CString& s) { m_sLabel = s; }
+
+CModule* CSocket::GetModule() const { return m_pModule; }
+const CString& CSocket::GetLabel() const { return m_sLabel; }
+/////////////////// !Socket ///////////////////
+
 CModule::CModule(void* pDLL, CUser* pUser, const CString& sModName) {
 	m_pDLL = pDLL;
 	m_pZNC = (pUser) ? pUser->GetZNC() : NULL;
@@ -127,6 +163,10 @@ CModule::~CModule() {
 		RemTimer(m_vTimers[0]->GetName());
 	}
 
+	while (m_vSockets.size()) {
+		RemSocket(m_vSockets[0]->GetLabel());
+	}
+
 	SaveRegistry();
 }
 
@@ -277,6 +317,93 @@ void CModule::ListTimers() {
 	}
 }
 
+bool CModule::AddSocket(CSocket* pSocket) {
+	if (!pSocket) {
+		return false;
+	}
+
+	m_vSockets.push_back(pSocket);
+	return true;
+}
+
+bool CModule::RemSocket(CSocket* pSocket) {
+	for (unsigned int a = 0; a < m_vSockets.size(); a++) {
+		if (m_vSockets[a] == pSocket) {
+			m_vSockets.erase(m_vSockets.begin() +a);
+			m_pManager->DelSockByAddr(pSocket);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool CModule::RemSocket(const CString& sLabel) {
+	for (unsigned int a = 0; a < m_vSockets.size(); a++) {
+		CSocket* pSocket = m_vSockets[a];
+
+		if (pSocket->GetLabel().CaseCmp(sLabel) == 0) {
+			m_vSockets.erase(m_vSockets.begin() +a);
+			m_pManager->DelSockByAddr(pSocket);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool CModule::UnlinkSocket(CSocket* pSocket) {
+	for (unsigned int a = 0; a < m_vSockets.size(); a++) {
+		if (pSocket == m_vSockets[a]) {
+			m_vSockets.erase(m_vSockets.begin() +a);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+CSocket* CModule::FindSocket(const CString& sLabel) {
+	for (unsigned int a = 0; a < m_vSockets.size(); a++) {
+		CSocket* pSocket = m_vSockets[a];
+		if (pSocket->GetLabel().CaseCmp(sLabel) == 0) {
+			return pSocket;
+		}
+	}
+
+	return NULL;
+}
+
+void CModule::ListSockets() {
+	if (!m_vSockets.size()) {
+		PutModule("You have no open sockets.");
+		return;
+	}
+
+	CTable Table;
+	Table.AddColumn("Name");
+	Table.AddColumn("State");
+	Table.AddColumn("RemoteIP");
+
+	for (unsigned int a = 0; a < m_vSockets.size(); a++) {
+		CSocket* pSocket = (CSocket*) m_vSockets[a];
+
+		Table.AddRow();
+		Table.SetCell("Name", pSocket->GetLabel());
+		Table.SetCell("State", (pSocket->IsConnected() ? "Connected" : ""));
+		Table.SetCell("RemoteIP", pSocket->GetRemoteIP());
+	}
+
+	if (Table.size()) {
+		unsigned int uTableIdx = 0;
+		CString sLine;
+
+		while (Table.GetLine(uTableIdx++, sLine)) {
+			PutModule(sLine);
+		}
+	}
+}
+
 const CString& CModule::GetModName() { return m_sModName; }
 CString CModule::GetModNick() { return ((m_pUser) ? m_pUser->GetStatusPrefix() : "*") + m_sModName; }
 
diff --git a/Modules.h b/Modules.h
index a5f48e30..bc8ae148 100644
--- a/Modules.h
+++ b/Modules.h
@@ -95,6 +95,29 @@ private:
 	FPTimer_t	m_pFBCallback;
 };
 
+class CSocket : public Csock {
+public:
+	CSocket(CModule* pModule, const CString& sLabel);
+	CSocket(CModule* pModule, const CString& sLabel, const CString& sHostname, unsigned short uPort, int iTimeout = 60);
+	virtual ~CSocket();
+
+	bool Connect(const CString& sHostname, unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 60);
+	bool Listen(unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 0);
+
+	// Setters
+	void SetModule(CModule* p);
+	void SetLabel(const CString& s);
+	// !Setters
+
+	// Getters
+	CModule* GetModule() const;
+	const CString& GetLabel() const;
+	// !Getters
+private:
+protected:
+	CModule*	m_pModule;
+	CString		m_sLabel;
+};
 
 class CModInfo {
 public:
@@ -218,6 +241,15 @@ public:
 	virtual void ListTimers();
 	// !Timer stuff
 
+	// Socket stuff
+	bool AddSocket(CSocket* pSocket);
+	bool RemSocket(CSocket* pSocket);
+	bool RemSocket(const CString& sLabel);
+	bool UnlinkSocket(CSocket* pSocket);
+	CSocket* FindSocket(const CString& sLabel);
+	virtual void ListSockets();
+	// !Socket stuff
+
 	bool LoadRegistry();
 	bool SaveRegistry();
 	bool SetNV(const CString & sName, const CString & sValue, bool bWriteToDisk = true);
@@ -234,11 +266,14 @@ public:
 
 	// Getters
 	const CString& GetDescription() const { return m_sDescription; }
+	CUser* GetUser() { return m_pUser; }
+	TSocketManager<Csock>* GetManager() { return m_pManager; }
 	// !Getters
 
 protected:
 	CString					m_sDescription;
 	vector<CTimer*>			m_vTimers;
+	vector<CSocket*>		m_vSockets;
 	void*					m_pDLL;
 	TSocketManager<Csock>*	m_pManager;
 	CUser*					m_pUser;