diff --git a/tech/Capacitor.wiki b/tech/Capacitor.wiki
new file mode 100644
index 0000000..39a791d
--- /dev/null
+++ b/tech/Capacitor.wiki
@@ -0,0 +1,5 @@
+= Capacitor =
+
+A Capacitor is a component that stores energy in an electric field. It does
+this by having two plates seperated by a dielectric. This is called
+capactitance and is measured in farads.
diff --git a/tech/Resistor.wiki b/tech/Resistor.wiki
new file mode 100644
index 0000000..1659db8
--- /dev/null
+++ b/tech/Resistor.wiki
@@ -0,0 +1,8 @@
+= Resistor =
+
+A resistor is a component that introduces resistance that opposes the flow of
+current. 
+
+A resistor has a set relationship with voltage and current, shown below
+
+V = I * R
diff --git a/tech/electronics.wiki b/tech/electronics.wiki
index 2e647f8..52e50ee 100644
--- a/tech/electronics.wiki
+++ b/tech/electronics.wiki
@@ -13,7 +13,16 @@ _Current_ is the flow of electricity. It is similar to water flow in a pipe.
 Current is not polarized, and not relative. A series circut always has the same
 current across all components.
 
-These two are related via 
+These two are related via the following equation (Ohms law):
+
+V = I * R
+
+Where V is voltage (Volts),
+I is current(Amps),
+and R is resistance(Ohms).
+
+Power is Voltage times Current and is measured in Watts (W). Power is a rate
+upon which electrical energy is used.
 
 == Primitive ==