diff --git a/rsa3/description.md b/rsa3/description.md
new file mode 100644
index 0000000..c61c847
--- /dev/null
+++ b/rsa3/description.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa3/description.md.BACKUP.137.md b/rsa3/description.md.BACKUP.137.md
new file mode 100644
index 0000000..68f5e9f
--- /dev/null
+++ b/rsa3/description.md.BACKUP.137.md
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
+=======
+>>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3
diff --git a/rsa3/description.md.BACKUP.20.md b/rsa3/description.md.BACKUP.20.md
new file mode 100644
index 0000000..68f5e9f
--- /dev/null
+++ b/rsa3/description.md.BACKUP.20.md
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
+=======
+>>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3
diff --git a/rsa3/description.md.BASE.137.md b/rsa3/description.md.BASE.137.md
new file mode 100644
index 0000000..6f6a960
--- /dev/null
+++ b/rsa3/description.md.BASE.137.md
@@ -0,0 +1 @@
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
\ No newline at end of file
diff --git a/rsa3/description.md.BASE.20.md b/rsa3/description.md.BASE.20.md
new file mode 100644
index 0000000..6f6a960
--- /dev/null
+++ b/rsa3/description.md.BASE.20.md
@@ -0,0 +1 @@
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
\ No newline at end of file
diff --git a/rsa3/description.md.LOCAL.137.md b/rsa3/description.md.LOCAL.137.md
new file mode 100644
index 0000000..c61c847
--- /dev/null
+++ b/rsa3/description.md.LOCAL.137.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa3/description.md.LOCAL.20.md b/rsa3/description.md.LOCAL.20.md
new file mode 100644
index 0000000..c61c847
--- /dev/null
+++ b/rsa3/description.md.LOCAL.20.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa3/description.md.REMOTE.137.md b/rsa3/description.md.REMOTE.137.md
new file mode 100644
index 0000000..e69de29
diff --git a/rsa3/description.md.REMOTE.20.md b/rsa3/description.md.REMOTE.20.md
new file mode 100644
index 0000000..e69de29
diff --git a/rsa3/grader.py b/rsa3/grader.py
new file mode 100644
index 0000000..4f6a800
--- /dev/null
+++ b/rsa3/grader.py
@@ -0,0 +1,56 @@
+<<<<<<< HEAD
+from cStringIO import StringIO
+
+flag = "wh3n_y0u_h4ve_p&q_RSA_iz_ez"
+
+def modx(base,exp,mod):
+    r = 1;
+    while (exp > 0):
+        if (exp % 2 == 1):
+            r = (r * base) % mod
+        base = (base * base) % mod
+        exp = exp/2
+    return r
+
+def probprime(s):
+    if s%2==0:
+        s += 1
+    smolprimes = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97]
+    while len(set([modx(i,s-1,s) for i in smolprimes])) != 1 or modx(2,s-1,s) != 1:
+        s+=2
+    return(s)
+
+def get_problem(random):
+    # add Probable Prime function later
+    p = probprime(random.randint(3*10**79,4*10**79))
+    q = probprime(random.randint(3*10**79,4*10**79))
+    e = 3
+    salt = "".join([random.choice("0123456789abcdef") for i in range(8)])
+    return (p, q, e, salt)
+
+def generate_ciphertext(random):
+    p, q, e, salt = get_problem(random)
+    encoded = int(("easyctf{%s_%s}" % (flag, salt)).encode('hex'),16)
+    ciphertext =  'p: '+str(p)+'\n'
+    ciphertext += 'q: '+str(q)+'\n'
+    ciphertext += 'e: '+str(e)+'\n'
+    ciphertext += 'c: '+str(pow(encoded, e, p*q))+'\n'
+
+    return StringIO(ciphertext)
+
+def generate(random):
+    return dict(files={
+        "ciphertext_rsa1.txt": generate_ciphertext
+    })
+
+def grade(random, key):
+    n, salt = get_problem(random)
+    if key.find("%s_%s" % (flag, salt)) >= 0:
+        return True, "Correct!"
+    return False, "Nope."
+=======
+def grade(autogen, key):
+    if key.find("tw0_v3ry_merrry_tw1n_pr1m35!!_417c0d") != -1:
+        return True, "Really Superb! Applause!"
+    return False, "RIP"
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa3/problem.yml b/rsa3/problem.yml
new file mode 100644
index 0000000..8ff5a4d
--- /dev/null
+++ b/rsa3/problem.yml
@@ -0,0 +1,19 @@
+<<<<<<< HEAD
+title: RSA 1
+author: neptunia
+hint: Go google RSA if you're stuck.
+category: Cryptography
+autogen: true
+programming: false
+value: 25
+=======
+author: blockingthesky
+title: RSA 3
+hint: You might want to read up on how RSA works.
+category: Cryptography
+autogen: false
+programming: false
+value: 70
+files:
+  - rsa3
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa3/rsa3 b/rsa3/rsa3
new file mode 100644
index 0000000..bda7c13
--- /dev/null
+++ b/rsa3/rsa3
@@ -0,0 +1,2 @@
+{N : e : c}
+{0x27335d21ca51432fa000ddf9e81f630314a0ef2e35d81a839584c5a7356b94934630ebfc2ef9c55b111e8c373f2db66ca3be0c0818b1d4eda7d53c1bd0067f66a12897099b5e322d85a8da45b72b828813af23L : 0x10001 : 0x9b9c138e0d473b6e6cf44acfa3becb358b91d0ba9bfb37bf11effcebf9e0fe4a86439e8217819c273ea5c1c5acfd70147533aa550aa70f2e07cc98be1a1b0ea36c0738d1c994c50b1bd633e3873fc0cb377e7L}
\ No newline at end of file
diff --git a/rsa4/description.md.BACKUP.137.md b/rsa4/description.md.BACKUP.137.md
new file mode 100644
index 0000000..68f5e9f
--- /dev/null
+++ b/rsa4/description.md.BACKUP.137.md
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
+=======
+>>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3
diff --git a/rsa4/description.md.BACKUP.20.md b/rsa4/description.md.BACKUP.20.md
new file mode 100644
index 0000000..68f5e9f
--- /dev/null
+++ b/rsa4/description.md.BACKUP.20.md
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
+=======
+>>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3
diff --git a/rsa4/description.md.BASE.137.md b/rsa4/description.md.BASE.137.md
new file mode 100644
index 0000000..6f6a960
--- /dev/null
+++ b/rsa4/description.md.BASE.137.md
@@ -0,0 +1 @@
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
\ No newline at end of file
diff --git a/rsa4/description.md.BASE.20.md b/rsa4/description.md.BASE.20.md
new file mode 100644
index 0000000..6f6a960
--- /dev/null
+++ b/rsa4/description.md.BASE.20.md
@@ -0,0 +1 @@
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
\ No newline at end of file
diff --git a/rsa4/description.md.LOCAL.137.md b/rsa4/description.md.LOCAL.137.md
new file mode 100644
index 0000000..c61c847
--- /dev/null
+++ b/rsa4/description.md.LOCAL.137.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa4/description.md.LOCAL.20.md b/rsa4/description.md.LOCAL.20.md
new file mode 100644
index 0000000..c61c847
--- /dev/null
+++ b/rsa4/description.md.LOCAL.20.md
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
+=======
+We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
+>>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
diff --git a/rsa4/description.md.REMOTE.137.md b/rsa4/description.md.REMOTE.137.md
new file mode 100644
index 0000000..e69de29
diff --git a/rsa4/description.md.REMOTE.20.md b/rsa4/description.md.REMOTE.20.md
new file mode 100644
index 0000000..e69de29
diff --git a/rsa4/rsa3 b/rsa4/rsa3
new file mode 100644
index 0000000..bda7c13
--- /dev/null
+++ b/rsa4/rsa3
@@ -0,0 +1,2 @@
+{N : e : c}
+{0x27335d21ca51432fa000ddf9e81f630314a0ef2e35d81a839584c5a7356b94934630ebfc2ef9c55b111e8c373f2db66ca3be0c0818b1d4eda7d53c1bd0067f66a12897099b5e322d85a8da45b72b828813af23L : 0x10001 : 0x9b9c138e0d473b6e6cf44acfa3becb358b91d0ba9bfb37bf11effcebf9e0fe4a86439e8217819c273ea5c1c5acfd70147533aa550aa70f2e07cc98be1a1b0ea36c0738d1c994c50b1bd633e3873fc0cb377e7L}
\ No newline at end of file