diff --git a/pom.xml b/pom.xml
index a06b8dcbf..55c5a2ded 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     <properties>
     	<java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <literacyapp.model.version>1.1.12</literacyapp.model.version>
+        <literacyapp.model.version>1.1.18</literacyapp.model.version>
         <hibernate.version>4.3.9.Final</hibernate.version>
         <jetty.version>8.1.14.v20131031</jetty.version>
         <spring.version>4.2.6.RELEASE</spring.version>
diff --git a/src/main/java/org/literacyapp/model/Student.java b/src/main/java/org/literacyapp/model/Student.java
index 1ec3c3bc8..25ee99911 100644
--- a/src/main/java/org/literacyapp/model/Student.java
+++ b/src/main/java/org/literacyapp/model/Student.java
@@ -4,6 +4,7 @@
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.NotEmpty;
@@ -17,7 +18,7 @@ public class Student extends BaseEntity {
     private Locale locale;
     
     @NotEmpty
-    @OneToMany
+    @OneToMany(fetch = FetchType.EAGER)
     private Set<Device> devices;
 
     public Locale getLocale() {
diff --git a/src/main/java/org/literacyapp/model/analytics/TaskEvent.java b/src/main/java/org/literacyapp/model/analytics/UsageEvent.java
similarity index 63%
rename from src/main/java/org/literacyapp/model/analytics/TaskEvent.java
rename to src/main/java/org/literacyapp/model/analytics/UsageEvent.java
index a361c039a..592b4348a 100644
--- a/src/main/java/org/literacyapp/model/analytics/TaskEvent.java
+++ b/src/main/java/org/literacyapp/model/analytics/UsageEvent.java
@@ -1,28 +1,21 @@
 package org.literacyapp.model.analytics;
 
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.ManyToOne;
 import javax.validation.constraints.NotNull;
 import org.literacyapp.model.Student;
 import org.literacyapp.model.admin.Application;
-import org.literacyapp.model.enums.content.TaskType;
 
 @Entity
-public class TaskEvent extends DeviceEvent {
-    
-    @ManyToOne
-    private Student student;
+public class UsageEvent extends DeviceEvent {
     
     @NotNull
     @ManyToOne
     private Application application;
     
-    @NotNull
-    @Enumerated(EnumType.STRING)
-    private TaskType taskType;
-
+    @ManyToOne
+    private Student student;
+    
     public Student getStudent() {
         return student;
     }
@@ -38,12 +31,4 @@ public Application getApplication() {
     public void setApplication(Application application) {
         this.application = application;
     }
-
-    public TaskType getTaskType() {
-        return taskType;
-    }
-
-    public void setTaskType(TaskType taskType) {
-        this.taskType = taskType;
-    }
 }
diff --git a/src/main/java/org/literacyapp/rest/v1/JavaToGsonConverter.java b/src/main/java/org/literacyapp/rest/v1/JavaToGsonConverter.java
index 89adfdcc8..f58321d67 100644
--- a/src/main/java/org/literacyapp/rest/v1/JavaToGsonConverter.java
+++ b/src/main/java/org/literacyapp/rest/v1/JavaToGsonConverter.java
@@ -1,7 +1,5 @@
 package org.literacyapp.rest.v1;
 
-import java.util.HashSet;
-import java.util.Set;
 import org.literacyapp.model.admin.Application;
 import org.literacyapp.model.Device;
 import org.literacyapp.model.content.Word;
@@ -109,21 +107,21 @@ public static DeviceGson getDeviceGson(Device device) {
             
             deviceJson.setId(device.getId());
             deviceJson.setDeviceId(device.getDeviceId());
-            deviceJson.setDeviceModel(device.getDeviceModel());
-            deviceJson.setTimeRegistered(device.getTimeRegistered());
-            deviceJson.setOsVersion(device.getOsVersion());
-            deviceJson.setLocale(device.getLocale());
-            
-            Set<DeviceGson> devicesNearby = new HashSet<DeviceGson>();
-            for (Device deviceNearby : device.getDevicesNearby()) {
-                DeviceGson deviceJsonNearby = getDeviceGson(deviceNearby);
-                if (deviceJsonNearby != null) {
-                    devicesNearby.add(deviceJsonNearby);
-                }
-            }
-            if (!devicesNearby.isEmpty()) {
-                deviceJson.setDevicesNearby(devicesNearby);
-            }
+//            deviceJson.setDeviceModel(device.getDeviceModel());
+//            deviceJson.setTimeRegistered(device.getTimeRegistered());
+//            deviceJson.setOsVersion(device.getOsVersion());
+//            deviceJson.setLocale(device.getLocale());
+//            
+//            Set<DeviceGson> devicesNearby = new HashSet<DeviceGson>();
+//            for (Device deviceNearby : device.getDevicesNearby()) {
+//                DeviceGson deviceJsonNearby = getDeviceGson(deviceNearby);
+//                if (deviceJsonNearby != null) {
+//                    devicesNearby.add(deviceJsonNearby);
+//                }
+//            }
+//            if (!devicesNearby.isEmpty()) {
+//                deviceJson.setDevicesNearby(devicesNearby);
+//            }
             
             return deviceJson;
         }
diff --git a/src/main/resources/db/migration/1001036.sql b/src/main/resources/db/migration/1001036.sql
index d064a72a2..df69bcd68 100644
--- a/src/main/resources/db/migration/1001036.sql
+++ b/src/main/resources/db/migration/1001036.sql
@@ -1,3 +1,4 @@
 # 1.1.36
 
-DROP TABLE DeviceEvent;
\ No newline at end of file
+DROP TABLE DeviceEvent;
+DROP TABLE TaskEvent;
\ No newline at end of file
diff --git a/src/main/webapp/img/admin/EGRA_ CONCEPTS_ABOUT_PRINT.png b/src/main/webapp/img/admin/EGRA_ CONCEPTS_ABOUT_PRINT.png
new file mode 100644
index 000000000..bf1b874ca
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_ CONCEPTS_ABOUT_PRINT.png differ
diff --git a/src/main/webapp/img/admin/EGRA_ FAMILIAR_WORD_READING.png b/src/main/webapp/img/admin/EGRA_ FAMILIAR_WORD_READING.png
new file mode 100644
index 000000000..9f13e3cd6
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_ FAMILIAR_WORD_READING.png differ
diff --git a/src/main/webapp/img/admin/EGRA_ LETTER_IDENTIFICATION.png b/src/main/webapp/img/admin/EGRA_ LETTER_IDENTIFICATION.png
new file mode 100644
index 000000000..d82930041
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_ LETTER_IDENTIFICATION.png differ
diff --git a/src/main/webapp/img/admin/EGRA_ NONWORD_READING.png b/src/main/webapp/img/admin/EGRA_ NONWORD_READING.png
new file mode 100644
index 000000000..ea3cb82db
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_ NONWORD_READING.png differ
diff --git a/src/main/webapp/img/admin/EGRA_ORAL_READING_FLUENCY.png b/src/main/webapp/img/admin/EGRA_ORAL_READING_FLUENCY.png
new file mode 100644
index 000000000..e1c1f8e85
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_ORAL_READING_FLUENCY.png differ
diff --git a/src/main/webapp/img/admin/EGRA_SYLLABLE_NAMING.png b/src/main/webapp/img/admin/EGRA_SYLLABLE_NAMING.png
new file mode 100644
index 000000000..d19f64305
Binary files /dev/null and b/src/main/webapp/img/admin/EGRA_SYLLABLE_NAMING.png differ