Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java
===================================================================
diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r33b67dae9d7861b3c43f3d2f49760eb5ac915d76
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java	(.../GmapSession.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapSession.java	(.../GmapSession.java)	(revision 33b67dae9d7861b3c43f3d2f49760eb5ac915d76)
@@ -60,7 +60,7 @@
 
 	private Gmap gmap;
 
-	private Set gmapUsers;
+	private Set<GmapUser> gmapUsers;
 
 	// Constructors
 
@@ -181,7 +181,7 @@
 	 * 
 	 */
 
-	public Set getGmapUsers() {
+	public Set<GmapUser> getGmapUsers() {
 		return this.gmapUsers;
 	}
 
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
diff -u -rbaf5d2db55e5db78d24d07464b301c0568762607 -r33b67dae9d7861b3c43f3d2f49760eb5ac915d76
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision baf5d2db55e5db78d24d07464b301c0568762607)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 33b67dae9d7861b3c43f3d2f49760eb5ac915d76)
@@ -134,27 +134,18 @@
 		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
 		GmapUser gmapUser = gmapService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),toolSessionID);
+		GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser);
+		request.getSession().setAttribute("userDTO", gmapUserDTO);
+		
 
-		//NotebookEntry gmapEntry = gmapService.getEntry(gmapUser.getEntryUID());
-
 		// construct dto's
 		GmapDTO gmapDTO = new GmapDTO(gmap);
-		//GmapDTO gmapDTO = new GmapDTO();
-		//gmapDTO.setTitle(gmap.getTitle());
-		//gmapDTO.setInstructions(gmap.getInstructions());
+		gmapDTO.setGmapMarkers(gmapService.getGmapMarkersBySessionId(toolSessionID));
+		
 
-		GmapSessionDTO sessionDTO = new GmapSessionDTO();
-		sessionDTO.setSessionName(gmapSession.getSessionName());
-		sessionDTO.setSessionID(gmapSession.getSessionId());
-		sessionDTO.setUserDTOs(gmapSession.getGmapUsers());
-
-		// If the user hasn't put in their entry yet, gmapEntry will be null;
-		//GmapUserDTO userDTO = gmapEntry != null ? new GmapUserDTO(gmapUser,gmapEntry) : new GmapUserDTO(gmapUser);
-
-		//GmapUserDTO userDTO = new GmapUserDTO(gmapUser);
+		GmapSessionDTO sessionDTO = new GmapSessionDTO(gmapSession);
+		request.getSession().setAttribute("sessionDTO", sessionDTO);
 		
-		
-		//sessionDTO.getUserDTOs().add(userDTO);
 		gmapDTO.getSessionDTOs().add(sessionDTO);
 
 		request.getSession().setAttribute("gmapDTO", gmapDTO);
@@ -179,17 +170,10 @@
 
 		GmapDTO gmapDTO = new GmapDTO(gmap);
 		
-		// add the gmapEntry for each user in each session
-		/*
-		for (GmapSessionDTO session : gmapDTO.getSessionDTOs()) {
-			for (GmapUserDTO user : session.getUserDTOs()) {
-				NotebookEntry entry = gmapService.getEntry(user.getEntryUID());
-				if (entry != null) { 
-					NotebookEntryDTO entryDTO = new NotebookEntryDTO(entry);
-					user.setEntryDTO(entryDTO);
-				}
-			}
-		}*/
+		for (GmapSessionDTO gmapSessionDTO : gmapDTO.getSessionDTOs() )
+		{
+			gmapSessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(gmapSessionDTO.getSessionID()));
+		}
 		
 		request.getSession().setAttribute("gmapDTO", gmapDTO);
 	}