diff --git a/pom.xml b/pom.xml
index 31fd0ddf..d015a31c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,13 @@
         <maven.compiler.source>1.8</maven.compiler.source>
     	<maven.compiler.target>1.8</maven.compiler.target>
     </properties>
+    <dependencies>
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>9.4-1200-jdbc41</version>
+     </dependency>
+    </dependencies>
 <build>
     <plugins>
         <plugin>
diff --git a/src/main/java/org/openshift/InsultGenerator.java b/src/main/java/org/openshift/InsultGenerator.java
index 1eec9bca..569cdd74 100644
--- a/src/main/java/org/openshift/InsultGenerator.java
+++ b/src/main/java/org/openshift/InsultGenerator.java
@@ -1,19 +1,44 @@
 package org.openshift;
 
-import java.util.Random;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
 
 public class InsultGenerator {
-	public String generateInsult() {
-		String words[][] = {{"Artless", "Bawdy", "Beslubbering"}, {"Base-court", "Bat-fowling", "Beef-witted"}, {"Apple-john", "Baggage", "Barnacle"}};
-		String vowels = "AEIOU";
-		String article = "an";
-		String firstAdjective = words[0][new Random().nextInt(words[0].length)];
-		String secondAdjective = words[1][new Random().nextInt(words[1].length)];
-		String noun = words[2][new Random().nextInt(words[2].length)];
-		if (vowels.indexOf(firstAdjective.charAt(0)) == -1) {
-			article = "a";
-		}
-		return String.format("Thou art %s %s %s %s!", article, firstAdjective, secondAdjective, noun);
-	}
+ public String generateInsult() {
+  String vowels = "AEIOU";
+  String article = "an";
+  String theInsult = "";
 
+
+  try {
+   String databaseURL = "jdbc:postgresql://";
+   databaseURL += System.getenv("POSTGRESQL_SERVICE_HOST");
+   databaseURL += "/" + System.getenv("POSTGRESQL_DATABASE");
+
+   String username = System.getenv("POSTGRESQL_USER");
+   String password = System.getenv("PGPASSWORD");
+   Connection connection = DriverManager.getConnection(databaseURL, username,password);
+
+   if (connection != null) {
+    String SQL = "select a.string AS first, b.string AS second, c.string AS noun
+    from short_adjective a , long_adjective b, noun c ORDER BY random() limit 1";
+    Statement stmt = connection.createStatement();
+    ResultSet rs = stmt.executeQuery(SQL);
+    while (rs.next()) {
+     if (vowels.indexOf(rs.getString("first").charAt(0)) == -1) {
+      article = "a";
+     }
+     theInsult =  String.format("Thou art %s %s %s %s!", article,
+     rs.getString("first"), rs.getString("second"), rs.getString("noun"));
+    }
+    rs.close();
+    connection.close();
+}
+  } catch (Exception e) {
+   return "Database connection problem!";
+  }
+  return theInsult;
+ }
 }