diff --git a/include/Component.hpp b/include/Component.hpp
index 70b7b6f..d98e7bc 100644
--- a/include/Component.hpp
+++ b/include/Component.hpp
@@ -12,8 +12,18 @@ public:
 	explicit Component(QWidget* parent);
 	explicit Component(QWidget* parent, const QString& resource);
 
-	void mouseMoveEvent(QMouseEvent* event) override;
+	virtual void mouseMoveEvent(QMouseEvent* event) override;
 
-private:
+	QPoint CenterPos();
+	void Connect(Component* component);
+	const QString& Type();
+
+	virtual bool Action() = 0;
+	
+
+protected:
 	Ui::Component* ui;
+
+	QString type;
+	std::vector<Component*> connections;
 };
\ No newline at end of file
diff --git a/include/Window.hpp b/include/Window.hpp
index ab06d71..29f8e22 100644
--- a/include/Window.hpp
+++ b/include/Window.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <qmainwindow.h>
+#include <qpen.h>
 
 namespace Ui {
 	class Window;
@@ -20,12 +21,14 @@ protected:
 	void mousePressEvent(QMouseEvent* event) override;
 	void mouseMoveEvent(QMouseEvent* event) override;
 	void mouseReleaseEvent(QMouseEvent* event) override;
+	void paintEvent(QPaintEvent* event) override;
 
 private:
 	void ToggleSimulation();
 	void ToggleComponentPlacer();
 	void LoadGhostLabel(const QString& resource);
 	Component* componentAt(const QPoint& point);
+	Component* createComponent(const QPoint& position);
 
 	Ui::Window* ui;
 	bool simulating;
@@ -34,10 +37,18 @@ private:
 		Component* component;
 		QPoint relativePos;
 	} dragInfo;
+	bool mouseDown;
 
 	GhostLabel* ghostImage;
 	QString resourcePath;
+	QPen pen;
+
 	QActionGroup* componentGroup;
 
+	enum class eComponent {
+		NOT, AND, NAND, OR, NOR, XOR, XNOR, SWITCH, LAMP
+	} componentType;
+
 	std::vector<Component*> components;
+	std::vector<QLine> wires;
 };
\ No newline at end of file
diff --git a/include/components/ANDgate.hpp b/include/components/ANDgate.hpp
new file mode 100644
index 0000000..cc50293
--- /dev/null
+++ b/include/components/ANDgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class ANDGate : public Component
+{
+public:
+	ANDGate(QWidget* parent) : Component(parent, ":/components/and.png") { type = "and"; }
+
+	bool Action() override {
+		return (connections[0]->Action() && connections[1]->Action());
+	}
+};
\ No newline at end of file
diff --git a/include/components/Lamp.hpp b/include/components/Lamp.hpp
new file mode 100644
index 0000000..d30d309
--- /dev/null
+++ b/include/components/Lamp.hpp
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class Lamp : public Component
+{
+public:
+	Lamp(QWidget* parent) : Component(parent, ":/components/lamp_off.png") { type = "lamp"; }
+
+	bool Action() override {
+		return connections[0]->Action();
+	}
+
+	void Turn(bool state) {
+		if (state)
+			ui->label->setPixmap(QPixmap(":/components/lamp_on.png"));
+		else
+			ui->label->setPixmap(QPixmap(":/components/lamp_off.png"));
+	}
+
+private:
+	bool state = false;
+};
\ No newline at end of file
diff --git a/include/components/NANDgate.hpp b/include/components/NANDgate.hpp
new file mode 100644
index 0000000..7e7cb68
--- /dev/null
+++ b/include/components/NANDgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class NANDGate : public Component
+{
+public:
+	NANDGate(QWidget* parent) : Component(parent, ":/components/nand.png") { type = "nand"; }
+
+	bool Action() override {
+		return !(connections[0]->Action() && connections[1]->Action());
+	}
+};
\ No newline at end of file
diff --git a/include/components/NORgate.hpp b/include/components/NORgate.hpp
new file mode 100644
index 0000000..18d9240
--- /dev/null
+++ b/include/components/NORgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class NORGate : public Component
+{
+public:
+	NORGate(QWidget* parent) : Component(parent, ":/components/nor.png") { type = "nor"; }
+
+	bool Action() override {
+		return !(connections[0]->Action() || connections[1]->Action());
+	}
+};
\ No newline at end of file
diff --git a/include/components/NOTgate.hpp b/include/components/NOTgate.hpp
new file mode 100644
index 0000000..d8ce9d1
--- /dev/null
+++ b/include/components/NOTgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class NOTGate : public Component
+{
+public:
+	NOTGate(QWidget* parent) : Component(parent, ":/components/not.png") { type = "not"; }
+
+	bool Action() override {
+		return !connections[0]->Action();
+	}
+};
\ No newline at end of file
diff --git a/include/components/ORgate.hpp b/include/components/ORgate.hpp
new file mode 100644
index 0000000..7146ac7
--- /dev/null
+++ b/include/components/ORgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class ORGate : public Component
+{
+public:
+	ORGate(QWidget* parent) : Component(parent, ":/components/or.png") { type = "or"; }
+
+	bool Action() override {
+		return (connections[0]->Action() || connections[1]->Action());
+	}
+};
\ No newline at end of file
diff --git a/include/components/Switch.hpp b/include/components/Switch.hpp
new file mode 100644
index 0000000..a392f26
--- /dev/null
+++ b/include/components/Switch.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <QWidget.h>
+#include "ui_Component.h"
+#include "../Component.hpp"
+
+class Switch : public Component
+{
+public:
+	Switch(QWidget* parent) : Component(parent, ":/components/switch_off.png") { type = "switch"; }
+
+	bool Action() override {
+		return state;
+	}
+
+	void Toggle() {
+		state = !state;
+		if (state)
+			ui->label->setPixmap(QPixmap(":/components/switch_on.png"));
+		else
+			ui->label->setPixmap(QPixmap(":/components/switch_off.png"));
+	}
+
+private:
+	bool state = false;
+};
\ No newline at end of file
diff --git a/include/components/XNORgate.hpp b/include/components/XNORgate.hpp
new file mode 100644
index 0000000..484125c
--- /dev/null
+++ b/include/components/XNORgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class XNORGate : public Component
+{
+public:
+	XNORGate(QWidget* parent) : Component(parent, ":/components/xnor.png") { type = "xnor"; }
+
+	bool Action() override {
+		return !((connections[0]->Action() || connections[1]->Action()) && !(connections[0]->Action() && connections[1]->Action()));
+	}
+};
\ No newline at end of file
diff --git a/include/components/XORgate.hpp b/include/components/XORgate.hpp
new file mode 100644
index 0000000..dd2d5c9
--- /dev/null
+++ b/include/components/XORgate.hpp
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <QWidget.h>
+#include "../Component.hpp"
+
+class XORGate : public Component
+{
+public:
+	XORGate(QWidget* parent) : Component(parent, ":/components/xor.png") { type = "xor"; }
+
+	bool Action() override {
+		return ((connections[0]->Action() || connections[1]->Action()) && !(connections[0]->Action() && connections[1]->Action()));
+	}
+};
\ No newline at end of file
diff --git a/src/Component.cpp b/src/Component.cpp
index 575b555..9d39cc3 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -23,3 +23,18 @@ void Component::mouseMoveEvent(QMouseEvent* event)
 {
 	event->ignore();
 }
+
+QPoint Component::CenterPos()
+{
+	return pos() + QPoint(size().width() / 2, size().height() / 2);
+}
+
+void Component::Connect(Component* component)
+{
+	connections.push_back(component);
+}
+
+const QString& Component::Type()
+{
+	return type;
+}
diff --git a/src/Window.cpp b/src/Window.cpp
index f33bb90..e41a0d2 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -2,6 +2,15 @@
 #include "ui_Window.h"
 
 #include "Component.hpp"
+#include "components/NOTgate.hpp"
+#include "components/ANDgate.hpp"
+#include "components/NANDgate.hpp"
+#include "components/ORgate.hpp"
+#include "components/NORgate.hpp"
+#include "components/XORgate.hpp"
+#include "components/XNORgate.hpp"
+#include "components/Switch.hpp"
+#include "components/Lamp.hpp"
 
 #include <iostream>
 #include <qevent.h>
@@ -21,6 +30,8 @@ Window::Window() :
 	setMouseTracking(true);
 
 	componentGroup = new QActionGroup(this);
+	componentGroup->addAction(ui->actionCursor);
+	componentGroup->addAction(ui->actionWiring);
 	componentGroup->addAction(ui->actionAddNOT);
 	componentGroup->addAction(ui->actionAddAND);
 	componentGroup->addAction(ui->actionAddNAND);
@@ -28,16 +39,25 @@ Window::Window() :
 	componentGroup->addAction(ui->actionAddNOR);
 	componentGroup->addAction(ui->actionAddXOR);
 	componentGroup->addAction(ui->actionAddXNOR);
-	componentGroup->setExclusionPolicy(QActionGroup::ExclusionPolicy::ExclusiveOptional);
+	componentGroup->addAction(ui->actionAddSwitch);
+	componentGroup->addAction(ui->actionAddLamp);
+	componentGroup->setExclusionPolicy(QActionGroup::ExclusionPolicy::Exclusive);
 
 	connect(ui->actionStart,	&QAction::triggered, this, &Window::ToggleSimulation);
-	connect(ui->actionAddNOT,	&QAction::triggered, this, [this]() {resourcePath = ":/components/not.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddAND,	&QAction::triggered, this, [this]() {resourcePath = ":/components/and.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddNAND,	&QAction::triggered, this, [this]() {resourcePath = ":/components/nand.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddOR,	&QAction::triggered, this, [this]() {resourcePath = ":/components/or.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddNOR,	&QAction::triggered, this, [this]() {resourcePath = ":/components/nor.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddXOR,	&QAction::triggered, this, [this]() {resourcePath = ":/components/xor.png"; ToggleComponentPlacer(); });
-	connect(ui->actionAddXNOR,	&QAction::triggered, this, [this]() {resourcePath = ":/components/xnor.png"; ToggleComponentPlacer(); });
+	connect(ui->actionCursor, &QAction::triggered, this, &Window::ToggleComponentPlacer);
+	connect(ui->actionWiring, &QAction::triggered, this, &Window::ToggleComponentPlacer);
+	connect(ui->actionAddNOT,	&QAction::triggered, this, [this]() {componentType = eComponent::NOT , resourcePath = ":/components/not.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddAND,	&QAction::triggered, this, [this]() {componentType = eComponent::AND, resourcePath = ":/components/and.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddNAND,	&QAction::triggered, this, [this]() {componentType = eComponent::NAND , resourcePath = ":/components/nand.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddOR,	&QAction::triggered, this, [this]() {componentType = eComponent::OR , resourcePath = ":/components/or.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddNOR,	&QAction::triggered, this, [this]() {componentType = eComponent::NOR , resourcePath = ":/components/nor.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddXOR,	&QAction::triggered, this, [this]() {componentType = eComponent::XOR, resourcePath = ":/components/xor.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddXNOR,	&QAction::triggered, this, [this]() {componentType = eComponent::XNOR , resourcePath = ":/components/xnor.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddSwitch,&QAction::triggered, this, [this]() {componentType = eComponent::SWITCH , resourcePath = ":/components/switch_off.png"; ToggleComponentPlacer(); });
+	connect(ui->actionAddLamp,	&QAction::triggered, this, [this]() {componentType = eComponent::LAMP , resourcePath = ":/components/lamp_off.png"; ToggleComponentPlacer(); });
+
+	pen.setColor(Qt::black);
+	pen.setWidth(3);
 }
 
 Window::~Window()
@@ -60,12 +80,13 @@ Window::~Window()
 
 void Window::mousePressEvent(QMouseEvent* event)
 {
+	mouseDown = true;
 	if (simulating) return;
 
 	Component* child = componentAt(event->pos());
 
 	QAction* toggledAction = componentGroup->checkedAction();
-	if (toggledAction == nullptr)
+	if (toggledAction == ui->actionCursor)
 	{
 		if (child == nullptr)
 			return;
@@ -73,49 +94,106 @@ void Window::mousePressEvent(QMouseEvent* event)
 		dragInfo.component = static_cast<Component*>(child);
 		dragInfo.relativePos = event->pos() - child->pos();
 	}
+	else if (toggledAction == ui->actionWiring)
+	{
+		if (child == nullptr)
+			return;
+
+		QPoint mousePos = ui->centralwidget->mapFromParent(event->pos());
+		mousePos.setY(mousePos.y() + ui->toolBar->height());
+		wires.push_back(QLine(child->CenterPos(), mousePos));
+		// std::cout << "(" << child->x() << ", " << child->y() << ") --> (" << mousePos.x() << ", " << mousePos.y() << ")" << std::endl;
+
+	}
 	else
 	{
 		if (child != nullptr)
 			return;
 
-		Component* leak = new Component(this, resourcePath);
-		QPoint pos = event->pos() - QPoint {50, 25};
-		leak->setGeometry(QRect(pos.x(), pos.y(), 100, 50));
-		leak->setFrameShape(QFrame::NoFrame);
-		leak->setFrameShadow(QFrame::Plain);
-		leak->setVisible(true);
-		leak->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-		components.push_back(leak);
+		createComponent(event->pos());
 	}
 }
 
 void Window::mouseMoveEvent(QMouseEvent* event)
 {
+	if (simulating) return;
+
 	if (dragInfo.component != nullptr)
+	{
 		dragInfo.component->move(event->pos() - dragInfo.relativePos);
+		// Move wires too lol
+	}
 
 	if (ghostImage != nullptr)
 		ghostImage->move(event->pos() - QPoint{50, ui->toolBar->height() + 25});	// TODO: Hardcoded
 
+	if ((componentGroup->checkedAction() == ui->actionWiring) && mouseDown)
+	{
+		QPoint mousePos = ui->centralwidget->mapFromParent(event->pos());
+		mousePos.setY(mousePos.y() + ui->toolBar->height());
+		wires.back().setP2(mousePos);
+	}
+
 	event->accept();
 }
 
 void Window::mouseReleaseEvent(QMouseEvent* event)
 {
+	if (simulating) return;
+	mouseDown = false;
+
+	if (componentGroup->checkedAction() == ui->actionWiring)
+	{
+		Component* connectFrom = componentAt(wires.back().p1());
+		Component* connectTo = componentAt(event->pos());
+		if (connectTo == nullptr || connectTo == connectFrom)
+		{ 
+			wires.pop_back();
+		}
+		else
+		{
+			wires.back().setP2(connectTo->CenterPos());
+			connectTo->Connect(connectFrom);
+		}
+	}
+	else if(componentGroup->checkedAction() == ui->actionCursor)
+	{
+		Component* clicked = componentAt(event->pos());
+		if (clicked != nullptr)
+			if (clicked->Type() == "switch")
+				static_cast<Switch*>(clicked)->Toggle();
+	}
+
 	dragInfo.component = nullptr;
 }
 
+void Window::paintEvent(QPaintEvent* event)
+{
+	QPainter painter(this);
+	painter.setPen(pen);
+
+	for(QLine line : wires)
+		painter.drawLine(line);
+
+	update();
+}
+
 void Window::ToggleSimulation()
 {
 	simulating = !simulating;
 	ui->actionStart->setIcon(QIcon(simulating ? ":/toolbar/stop.png" : ":/toolbar/start.png"));
+
+	for (Component* c : components)
+	{
+		if (c->Type() == "lamp")
+			static_cast<Lamp*>(c)->Turn(c->Action());
+	}
 }
 
 void Window::ToggleComponentPlacer()
 {
 	QAction* toggledAction = componentGroup->checkedAction();
-	if (toggledAction == nullptr)
+	if (toggledAction == ui->actionCursor || toggledAction == ui->actionWiring)
 	{
 		delete ghostImage;
 		ghostImage = nullptr;
@@ -163,3 +241,35 @@ Component* Window::componentAt(const QPoint& point)
 
 	return nullptr;
 }
+
+Component* Window::createComponent(const QPoint& position)
+{
+	Component* leak = nullptr;
+
+	switch (componentType)
+	{
+	case eComponent::NOT:		leak = new NOTGate(this);	break;
+	case eComponent::AND:		leak = new ANDGate(this);	break;
+	case eComponent::NAND:		leak = new NANDGate(this);	break;
+	case eComponent::OR:		leak = new ORGate(this);	break;
+	case eComponent::NOR:		leak = new NORGate(this);	break;
+	case eComponent::XOR:		leak = new XORGate(this);	break;
+	case eComponent::XNOR:		leak = new XNORGate(this);	break;
+	case eComponent::SWITCH:	leak = new Switch(this);	break;
+	case eComponent::LAMP:		leak = new Lamp(this);		break;
+	}
+
+	if (leak != nullptr)
+	{
+		QPoint pos = position - QPoint{ 50, 25 };
+		leak->setGeometry(QRect(pos.x(), pos.y(), 100, 50));
+		leak->setFrameShape(QFrame::NoFrame);
+		leak->setFrameShadow(QFrame::Plain);
+		leak->setVisible(true);
+		leak->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		components.push_back(leak);
+	}
+
+	return leak;
+}
diff --git a/ui/Window.ui b/ui/Window.ui
index 72a389c..35e0744 100644
--- a/ui/Window.ui
+++ b/ui/Window.ui
@@ -30,6 +30,9 @@
    </attribute>
    <addaction name="actionStart"/>
    <addaction name="separator"/>
+   <addaction name="actionCursor"/>
+   <addaction name="actionWiring"/>
+   <addaction name="separator"/>
    <addaction name="actionAddNOT"/>
    <addaction name="actionAddAND"/>
    <addaction name="actionAddNAND"/>
@@ -37,6 +40,8 @@
    <addaction name="actionAddNOR"/>
    <addaction name="actionAddXOR"/>
    <addaction name="actionAddXNOR"/>
+   <addaction name="actionAddSwitch"/>
+   <addaction name="actionAddLamp"/>
   </widget>
   <action name="actionStart">
    <property name="icon">
@@ -183,6 +188,63 @@
     <string>7</string>
    </property>
   </action>
+  <action name="actionAddSwitch">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="assets/resources.qrc">
+     <normaloff>:/components/switch.png</normaloff>:/components/switch.png</iconset>
+   </property>
+   <property name="text">
+    <string>AddSwitch</string>
+   </property>
+  </action>
+  <action name="actionAddLamp">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="assets/resources.qrc">
+     <normaloff>:/components/lamp.png</normaloff>:/components/lamp.png</iconset>
+   </property>
+   <property name="text">
+    <string>AddLamp</string>
+   </property>
+  </action>
+  <action name="actionCursor">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="assets/resources.qrc">
+     <normaloff>:/toolbar/cursor.png</normaloff>:/toolbar/cursor.png</iconset>
+   </property>
+   <property name="text">
+    <string>Cursor</string>
+   </property>
+   <property name="toolTip">
+    <string>Default Mode</string>
+   </property>
+  </action>
+  <action name="actionWiring">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="assets/resources.qrc">
+     <normaloff>:/toolbar/wire.png</normaloff>:/toolbar/wire.png</iconset>
+   </property>
+   <property name="text">
+    <string>Wiring</string>
+   </property>
+   <property name="toolTip">
+    <string>Wiring mode</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="assets/resources.qrc"/>
diff --git a/ui/assets/cursor.png b/ui/assets/cursor.png
new file mode 100644
index 0000000..ec6ed9d
Binary files /dev/null and b/ui/assets/cursor.png differ
diff --git a/ui/assets/lamp.png b/ui/assets/lamp.png
new file mode 100644
index 0000000..55ae9fc
Binary files /dev/null and b/ui/assets/lamp.png differ
diff --git a/ui/assets/lamp_off.png b/ui/assets/lamp_off.png
new file mode 100644
index 0000000..0de9eae
Binary files /dev/null and b/ui/assets/lamp_off.png differ
diff --git a/ui/assets/lamp_on.png b/ui/assets/lamp_on.png
new file mode 100644
index 0000000..7fc2c2f
Binary files /dev/null and b/ui/assets/lamp_on.png differ
diff --git a/ui/assets/resources.qrc b/ui/assets/resources.qrc
index 3f9044c..65c2a4c 100644
--- a/ui/assets/resources.qrc
+++ b/ui/assets/resources.qrc
@@ -2,6 +2,8 @@
     <qresource prefix="/toolbar">
         <file>start.png</file>
         <file>stop.png</file>
+        <file>cursor.png</file>
+        <file>wire.png</file>
     </qresource>
     <qresource prefix="/components">
         <file>and.png</file>
@@ -11,5 +13,11 @@
         <file>not.png</file>
         <file>xnor.png</file>
         <file>xor.png</file>
+        <file>lamp.png</file>
+        <file>lamp_off.png</file>
+        <file>lamp_on.png</file>
+        <file>switch.png</file>
+        <file>switch_off.png</file>
+        <file>switch_on.png</file>
     </qresource>
 </RCC>
diff --git a/ui/assets/switch.png b/ui/assets/switch.png
new file mode 100644
index 0000000..ded46af
Binary files /dev/null and b/ui/assets/switch.png differ
diff --git a/ui/assets/switch_off.png b/ui/assets/switch_off.png
new file mode 100644
index 0000000..5406d25
Binary files /dev/null and b/ui/assets/switch_off.png differ
diff --git a/ui/assets/switch_on.png b/ui/assets/switch_on.png
new file mode 100644
index 0000000..d4c379d
Binary files /dev/null and b/ui/assets/switch_on.png differ
diff --git a/ui/assets/wire.png b/ui/assets/wire.png
new file mode 100644
index 0000000..aefa974
Binary files /dev/null and b/ui/assets/wire.png differ