diff --git a/Data/Numbers.hs b/Data/Numbers.hs
--- a/Data/Numbers.hs
+++ b/Data/Numbers.hs
@@ -1,9 +1,6 @@
 -- | This is an assortment of number theorectic functions. As of now it's not very large or fast, but that should improve over time.
 module Data.Numbers 
 (
-    primes,
-    isPrime,
-    isProbablyPrime,
     primeFactors,
     numOfFactors,
     factorSum,
@@ -11,11 +8,6 @@
 
 import Data.List
 import Data.Numbers.Primes
-
-
--- | Checks whether a number is prime    
-isPrime :: Integer -> Bool
-isPrime n      = all (not .(\p-> (n `mod` p) == 0)) $ takeWhile (\p -> p*p <= n) primes
 
 -- | Returns the prime factors for a given number
 primeFactors :: Integer -> [Integer]  
diff --git a/Data/Numbers/Primes.hs b/Data/Numbers/Primes.hs
new file mode 100644
--- /dev/null
+++ b/Data/Numbers/Primes.hs
@@ -0,0 +1,84 @@
+module Data.Numbers.Primes (
+    primes,
+    isPrime,
+    isProbablyPrime) where
+
+import System.Random
+
+data Wheel = Wheel Integer [Integer] [Integer]
+
+wheels = Wheel 1 [1] [] : zipWith3 nextSize wheels primes squares
+
+squares = [p*p | p <- primes]
+
+nextSize :: Wheel -> Integer -> Integer -> Wheel
+nextSize (Wheel s ms ns) p q = Wheel (s*p) ms' ns' where
+    (xs, ns') = span (<=q) (foldr (turn 0) (roll (p-1) s) ns)
+    ms' = foldr (turn 0) xs ms
+    roll 0 _ = []
+    roll t o = foldr (turn o) (foldr (turn o) (roll (t-1) (o+s)) ns) ms
+    turn o n rs = let n' = o+n in [n' | n' `mod` p > 0] ++ rs
+
+-- | An infinite list of prime numbers, generated as described here <http://www.cs.york.ac.uk/ftpdir/pub/colin/jfp97lw.ps.gz>
+primes :: [Integer] 
+primes = spiral wheels primes squares
+
+spiral (Wheel s ms ns : ws) ps qs = foldr (turn 0) (roll s) ns where
+    roll o = foldr (turn o) (foldr (turn o) (roll (o+s)) ns) ms
+    turn o n rs = let n' = o+n in
+        if n'==2 || n'< head qs then n':rs else dropWhile (<n') (spiral ws (tail ps) (tail qs))
+     
+     
+-- | Checks whether a number is prime    
+isPrime :: Integer -> Bool
+isPrime n      = all (not .(\p-> (n `mod` p) == 0)) $ takeWhile (\p -> p*p <= n) primes
+   
+
+-- Miller Rabin Primality from the Haskell Wiki --
+
+find2km :: Integral a => a -> (a,a)
+find2km n = f 0 n
+    where 
+        f k m
+            | r == 1 = (k,m)
+            | otherwise = f (k+1) q
+            where (q,r) = quotRem m 2        
+
+-- | Performs a Miller Rabin Primality Test. According to the Wikipedia it's false positive with a probability of less than 25%. It's never false negative. Use it several times to increase confidence.
+isProbablyPrime :: RandomGen g => Integer -> g -> (Bool, g)
+isProbablyPrime n gen
+    | n < 2 = (False,gen')
+    | n == 2 = (True, gen')
+    | even n = (False, gen')
+    | b0 == 1 || b0 == n' = (True, gen')
+    | otherwise = (iter (tail b), gen')
+    where
+        (a, gen') = randomR (2,n-2) gen
+        n' = n-1
+        (k,m) = find2km n'
+        b0 = powMod n a m
+        b = take (fromIntegral k) $ iterate (squareMod n) b0
+        iter [] = False
+        iter (x:xs)
+            | x == 1 = False
+            | x == n' = True
+            | otherwise = iter xs
+ 
+pow' :: (Num a, Integral b) => (a -> a -> a) -> (a -> a) -> a -> b -> a
+pow' _ _ _ 0 = 1
+pow' mul sq x' n' = f x' n' 1
+    where 
+        f x n y
+            | n == 1 = x `mul` y
+            | r == 0 = f x2 q y
+            | otherwise = f x2 q (x `mul` y)
+            where
+                (q,r) = quotRem n 2
+                x2 = sq x
+ 
+mulMod :: Integral a => a -> a -> a -> a
+mulMod a b c = (b * c) `mod` a
+squareMod :: Integral a => a -> a -> a
+squareMod a b = (b * b) `rem` a
+powMod :: Integral a => a -> a -> a -> a
+powMod m = pow' (mulMod m) (squareMod m)
diff --git a/Numbers.cabal b/Numbers.cabal
--- a/Numbers.cabal
+++ b/Numbers.cabal
@@ -1,5 +1,5 @@
 Name:                Numbers
-Version:             0.2
+Version:             0.2.1
 Cabal-Version: >= 1.2
 Synopsis:            An assortment of number theoretic functions
 Description:         Functions for finding prime numbers, checking whether a number is prime, finding the factors of a number etc.
@@ -14,7 +14,7 @@
 extra-source-files:  README, Changelog, test.hs, lgpl-3.0.txt
 
 Library
-    exposed-modules:     Data.Numbers
+    exposed-modules:     Data.Numbers, Data.Numbers.Primes
     build-depends: 
          base,
          random >= 1.0.0.1