Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
===================================================================
diff -u -r0aaa2828b0f3355d28a0d13b4ac161ac25fc8056 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision 0aaa2828b0f3355d28a0d13b4ac161ac25fc8056)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -24,8 +24,8 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McContent;
-import org.lamsfoundation.lams.tool.mc.McSession;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
 /**
  * @author Ozgur Demirtas
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 690cf7460e6899ac1279fc823d9819a2060744b1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
 
 /**
  * @author Ozgur Demirtas
@@ -102,6 +102,8 @@
 	 * @param mcOptionsContent
 	 */
 	public void removeMcOptionsContent(McOptsContent mcOptsContent);
+	
+	public List findMcOptionNamesByQueId(Long mcQueContentId);
 }
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
diff -u -r25fb91f5a3a61767111f14f48c2fc95de22746c0 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 25fb91f5a3a61767111f14f48c2fc95de22746c0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McQueContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
 
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
===================================================================
diff -u -r39bba88406e992a64fefc1b32cb7b4c0383ebfd1 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision 39bba88406e992a64fefc1b32cb7b4c0383ebfd1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -24,10 +24,9 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McContent;
-import org.lamsfoundation.lams.tool.mc.McQueUsr;
-import org.lamsfoundation.lams.tool.mc.McSession;
-import org.springframework.orm.hibernate3.HibernateTemplate;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
 
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java
===================================================================
diff -u -rf6991bff0a6a158b9432f338079cc3fc650dd389 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision f6991bff0a6a158b9432f338079cc3fc650dd389)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McUploadedFile;
+import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 
 /**
  * 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -23,9 +23,11 @@
 
 package org.lamsfoundation.lams.tool.mc.dao;
 
-import org.lamsfoundation.lams.tool.mc.McQueUsr; 
-import org.lamsfoundation.lams.tool.mc.McSession;
+import java.util.List;
 
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
+
 /**
  * @author Ozgur Demirtas
  * <p>Interface for the McUser DAO, defines methods needed to access/modify user data</p>
@@ -85,5 +87,7 @@
      * @return the number of users that are in this session
      */
     public int getNumberOfUsers(McSession mcSession);
+    
+    public List getMcUserBySessionOnly(final McSession mcSession);
    
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
===================================================================
diff -u -r39bba88406e992a64fefc1b32cb7b4c0383ebfd1 -r20ace80303ee4b073668858cc7b41525375e241b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	(.../IMcUsrAttemptDAO.java)	(revision 39bba88406e992a64fefc1b32cb7b4c0383ebfd1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	(.../IMcUsrAttemptDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.tool.mc.McUsrAttempt;
+import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
 
 
 /**
@@ -124,6 +124,9 @@
 	 * 
 	 * @return 
 	 */
+	
+	public List getAttemptsForUser(final Long queUsrId);
+	
 	public List getMarks();
 }