diff --git a/VERSION b/VERSION
index 1111c9c..4adba7e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.14
\ No newline at end of file
+0.0.1-SNAPSHOT
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c6c0ccb..d47869c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,37 +2,48 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.traitify</groupId>
-    <artifactId>traitify-java</artifactId>
+    <artifactId>traitify-jersey2</artifactId>
     <packaging>jar</packaging>
-    <version>0.0.14</version>
+    <version>0.0.2</version>
     <name>traitify-java</name>
     <url>https://github.com/woofound/traitify-java</url>
     <dependencies>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
+            <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
-            <version>1.18.1</version>
+            <version>2.31</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>2.31</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>2.31</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.3.3</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.3.3</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-base</artifactId>
-            <version>2.3.3</version>
+            <version>2.10.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.3.3</version>
+            <version>2.10.1</version>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -42,7 +53,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>15.0</version>
+            <version>19.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -108,8 +119,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/traitify/models/Assessment.java b/src/main/java/com/traitify/models/Assessment.java
index 8a89042..5c9f453 100644
--- a/src/main/java/com/traitify/models/Assessment.java
+++ b/src/main/java/com/traitify/models/Assessment.java
@@ -1,9 +1,11 @@
 package com.traitify.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.sun.jersey.api.client.GenericType;
 import com.traitify.net.ApiModel;
 
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
 import java.util.Date;
 import java.util.List;
 
@@ -25,27 +27,33 @@ public static Assessment create(String deck_id) {
     }
 
     public static Assessment create(Assessment assessment) {
-        return baseResource("assessments").post(Assessment.class, assessment);
+        return baseResource("assessments").post(Entity.entity(
+                assessment, MediaType.APPLICATION_JSON_TYPE)).readEntity(Assessment.class);
     }
 
     public static Assessment update(Assessment assessment) {
-        return baseResource("assessments/" + assessment.getId()).put(Assessment.class, assessment);
+        return baseResource("assessments/" + assessment.getId()).put(Entity.entity(
+                assessment, MediaType.APPLICATION_JSON_TYPE)).readEntity(Assessment.class);
     }
 
     public static AssessmentPersonalityTypes personalityTypes(String assessment_id){
-        return baseResource("assessments/" + assessment_id + "/personality_types").get(AssessmentPersonalityTypes.class);
+        return baseResource("assessments/" + assessment_id + "/personality_types")
+                .get().readEntity(AssessmentPersonalityTypes.class);
     }
 
     public static List<AssessmentPersonalityTrait> personalityTraits(String assessment_id, String personality_type_id){
-        return baseResource("assessments/" + assessment_id + "/personality_types/" + personality_type_id + "/personality_traits").get(new GenericType<List<AssessmentPersonalityTrait>>() {});
+        return baseResource("assessments/" + assessment_id + "/personality_types/" + personality_type_id + "/personality_traits")
+                .get().readEntity(new GenericType<List<AssessmentPersonalityTrait>>() {});
     }
 
     public static List<AssessmentPersonalityTraitDichotomy> personalityTraits(String assessment_id){
-        return baseResource("assessments/" + assessment_id + "/personality_traits").get(new GenericType<List<AssessmentPersonalityTraitDichotomy>>(){});
+        return baseResource("assessments/" + assessment_id + "/personality_traits")
+                .get().readEntity(new GenericType<List<AssessmentPersonalityTraitDichotomy>>(){});
     }
 
     public static List<AssessmentPersonalityTrait> rawPersonalityTraits(String assessment_id){
-        return baseResource("assessments/" + assessment_id + "/personality_traits/raw").get(new GenericType<List<AssessmentPersonalityTrait>>(){});
+        return baseResource("assessments/" + assessment_id + "/personality_traits/raw")
+                .get().readEntity(new GenericType<List<AssessmentPersonalityTrait>>(){});
     }
 
     public static List<ScoredCareer> careerMatches(String assessment_id){
diff --git a/src/main/java/com/traitify/models/Deck.java b/src/main/java/com/traitify/models/Deck.java
index 8c43ba6..fb07ae8 100644
--- a/src/main/java/com/traitify/models/Deck.java
+++ b/src/main/java/com/traitify/models/Deck.java
@@ -1,17 +1,16 @@
 package com.traitify.models;
 
-import com.sun.jersey.api.client.GenericType;
-import com.traitify.net.ApiModel;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.traitify.net.ApiModel;
 
-import java.util.Date;
+import javax.ws.rs.core.GenericType;
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Deck extends ApiModel {
 
     public static List<Deck> list() {
-        return baseResource("decks").get(new GenericType<List<Deck>>(){});
+        return baseResource("decks").get().readEntity(new GenericType<List<Deck>>(){});
     }
 
     private String id;
diff --git a/src/main/java/com/traitify/models/Slide.java b/src/main/java/com/traitify/models/Slide.java
index f827678..8147f9c 100644
--- a/src/main/java/com/traitify/models/Slide.java
+++ b/src/main/java/com/traitify/models/Slide.java
@@ -1,9 +1,11 @@
 package com.traitify.models;
 
-import com.sun.jersey.api.client.GenericType;
-import com.traitify.net.ApiModel;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.traitify.net.ApiModel;
 
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
 import java.util.Date;
 import java.util.List;
 
@@ -11,7 +13,7 @@
 public class Slide extends ApiModel {
 
     public static List<Slide> list(String assessment_id){
-        return baseResource("assessments/" + assessment_id + "/slides").get(new GenericType<List<Slide>>(){});
+        return baseResource("assessments/" + assessment_id + "/slides").get().readEntity(new GenericType<List<Slide>>(){});
     }
 
     public static Slide get(String assessment_id, String slide_id){
@@ -19,11 +21,13 @@ public static Slide get(String assessment_id, String slide_id){
     }
 
     public static Slide update(String assessment_id, Slide slide){
-        return baseResource("assessments/" + assessment_id + "/slides/" + slide.getId()).put(Slide.class, slide);
+        return baseResource("assessments/" + assessment_id + "/slides/" + slide.getId()).put(
+                Entity.entity(slide, MediaType.APPLICATION_JSON_TYPE)).readEntity(Slide.class);
     }
 
     public static List<Slide> bulkUpdate(String assessment_id, List<Slide> slides) {
-        return baseResource("assessments/" + assessment_id + "/slides").put(new GenericType<List<Slide>>(){}, slides);
+        return baseResource("assessments/" + assessment_id + "/slides").put(
+                Entity.entity(slides, MediaType.APPLICATION_JSON_TYPE)).readEntity(new GenericType<List<Slide>>(){});
     }
 
     private String id;
diff --git a/src/main/java/com/traitify/net/ApiModel.java b/src/main/java/com/traitify/net/ApiModel.java
index b1bb517..3ab4523 100644
--- a/src/main/java/com/traitify/net/ApiModel.java
+++ b/src/main/java/com/traitify/net/ApiModel.java
@@ -1,10 +1,11 @@
 package com.traitify.net;
 
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.Base64;
 import com.traitify.Traitify;
+import java.util.Base64;
 
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation;
 import javax.ws.rs.core.MediaType;
 
 public abstract class ApiModel {
@@ -12,19 +13,17 @@ public abstract class ApiModel {
     public ApiModel(){
     }
 
-    public static WebResource.Builder baseResource(String path) {
-        Client client = Client.create();
+    public static Invocation.Builder baseResource(String path) {
+        Client client = ClientBuilder.newClient();
 
         return client
-            .resource(Traitify.getApiBase() + "/" + Traitify.apiVersion  + "/" + path)
-            .accept(MediaType.APPLICATION_JSON)
-            .type(MediaType.APPLICATION_JSON)
+            .target(Traitify.getApiBase() + "/" + Traitify.apiVersion  + "/" + path)
+            .request(MediaType.APPLICATION_JSON)
             .header("Authorization", authHeader())
             .header("Accept-Content-Encoding", "gzip, deflate");
     }
 
     public static String authHeader() {
-        return "Basic " + new String(Base64.encode(Traitify.apiKey + ":x"));
+        return "Basic " + new String(Base64.getEncoder().encode((Traitify.apiKey + ":x").getBytes()));
     }
-
 }