diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..dab098e
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,37 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/node:8.8.1
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/mongo:3.4.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "package.json" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run: yarn install
+
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+
+      # run tests!
+      - run: yarn test
diff --git a/README.md b/README.md
index 41b9f38..0b2e276 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
+[![CircleCI](https://circleci.com/gh/BHess2653/urlShortner.svg?style=svg)](https://circleci.com/gh/BHess2653/urlShortner)
 # Basic Installation and Testing.
 
-# Prerequisites 
+# Prerequisites
 
 * node
 * npm
diff --git a/package.json b/package.json
index 079a25e..42d34cc 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,19 @@
   "version": "1.0.0",
   "description": "",
   "main": "src/tool.js",
+  "engines": {
+    "node": "v8.8.1",
+    "npm": "3.10.3"
+  },
   "scripts": {
     "start": "node src/server.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "mocha"
   },
   "author": "chapman",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.15.3"
+    "express": "^4.15.3",
+    "mocha": "^5.0.1"
   },
   "devDependencies": {
     "chai": "^3.5.0"
diff --git a/src/tool.js b/src/tool.js
index 0997882..f0ca818 100644
--- a/src/tool.js
+++ b/src/tool.js
@@ -2,7 +2,7 @@ exports.genURL = (urlLength) => {
   var urlString = "";
   const sourceLetters = "ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789";
 
-  for(var genLoopIndex = 0; genLoopIndex < 50; genLoopIndex++){
+  for(var genLoopIndex = 0; genLoopIndex < urlLength; genLoopIndex++){
 
     // Add a random letter to the urlString
     urlString += sourceLetters.charAt(Math.random() * (sourceLetters.length - 1))