diff --git a/magnetism.c b/magnetism.c
new file mode 100644
index 0000000..b49e8c8
--- /dev/null
+++ b/magnetism.c
@@ -0,0 +1,24 @@
+#include "magnetism.h"
+#include "consts.h"
+#include "vec_utils.h"
+#include <math.h>
+
+#define EPSILON 8.85418782E-12
+
+void magnetism(universe_t* uni){
+  mass_body_t body_1;
+  mass_body_t body_2;
+  Vector2 diff, force;
+  for (unsigned int i = 0; i < uni->num_bodies-1; i++) {
+    body_1 = uni->bodies[i];
+      for (unsigned int y = i + 1; y < uni->num_bodies; y++) {
+        body_2 = uni->bodies[y];
+        diff=vec2_diff(body_2.position,body_1.position);
+        force = vec2_scale(diff,body_1.charge*body_2.charge/(4*PI*EPSILON*vec2_len(diff)));
+        body_1.speed=vec2_sum(body_1.speed,vec2_scale(force,1/body_1.mass));
+        body_2.speed=vec2_diff(body_2.speed,vec2_scale(force,1/body_2.mass));
+        uni->bodies[y] = body_2;
+    }
+    uni->bodies[i] = body_1;
+  }
+}
diff --git a/magnetism.h b/magnetism.h
new file mode 100644
index 0000000..7a49931
--- /dev/null
+++ b/magnetism.h
@@ -0,0 +1,7 @@
+#ifndef MAGNETISM_H
+#define MAGNETISM_H
+#include "objects.h"
+void magnetism(universe_t* univ);
+
+
+#endif // MAGNETISM_H
diff --git a/main.c b/main.c
index bf864ed..e704cf6 100644
--- a/main.c
+++ b/main.c
@@ -3,6 +3,9 @@
 #include "consts.h"
 #include "gravity.h"
 #include "mechanics.h"
+<<<<<<< HEAD
+#include "magnetism.h"
+=======
 #include "objects.h"
 #include "vec_utils.h"
 #include <bits/time.h>
@@ -35,6 +38,7 @@ void *physics(void *args) {
     clock_gettime(CLOCK_MONOTONIC, &ct);
     gravity(uni);
     mechanics(uni);
+    magnetism(uni);
     ot = ct;
     long long elapsed = timespec_diff_ns(ct, ot);
     long long remaining = TIMESTEP / simx - elapsed;
diff --git a/objects.h b/objects.h
index c01398c..8b38d1b 100644
--- a/objects.h
+++ b/objects.h
@@ -8,6 +8,7 @@ typedef struct {
   Vector2 position;
   Vector2 speed;
   float draw_radius;
+  float charge;
 } mass_body_t;
 
 typedef struct universe {