From 0a71b802dff8a3f1452efb60cf574a327a828586 Mon Sep 17 00:00:00 2001
From: bjl23 <bjl23@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 22 Nov 2010 16:24:00 +0000
Subject: [PATCH] SDB code into trunk; not yet active by default

---
 webapp/config/web.xml                         |    3 +-
 .../webapp/controller/SparqlQueryServlet.java |   24 +-
 .../vitro/webapp/controller/VitroRequest.java |   30 +-
 .../Properties2PropertiesRetryController.java |    8 +-
 .../freemarker/BrowseController.java          |   62 +-
 .../controller/jena/RDFUploadController.java  |    7 +-
 .../dao/filtering/VClassDaoFiltering.java     |    1 +
 .../jena/DataPropertyStatementDaoJena.java    |   11 +-
 .../dao/jena/DataPropertyStatementDaoSDB.java |  100 ++
 .../webapp/dao/jena/IndividualDaoJena.java    |   30 +-
 .../webapp/dao/jena/IndividualDaoSDB.java     |  444 ++++++
 .../vitro/webapp/dao/jena/IndividualSDB.java  | 1248 +++++++++++++++++
 .../vitro/webapp/dao/jena/IndividualSDB2.java | 1167 +++++++++++++++
 .../KeywordIndividualRelationDaoJena.java     |    3 +-
 .../vitro/webapp/dao/jena/LinksDaoJena.java   |    3 +-
 .../jena/ObjectPropertyStatementDaoJena.java  |    7 +-
 .../jena/ObjectPropertyStatementDaoSDB.java   |  139 ++
 .../webapp/dao/jena/OntModelSelectorImpl.java |   68 +
 .../webapp/dao/jena/SDBGraphGenerator.java    |   50 +
 .../vitro/webapp/dao/jena/VClassDaoJena.java  |   48 +-
 .../vitro/webapp/dao/jena/VClassDaoSDB.java   |  110 ++
 .../webapp/dao/jena/WebappDaoFactoryJena.java |    2 +-
 .../webapp/dao/jena/WebappDaoFactorySDB.java  |   60 +
 .../edit/n3editing/StandardModelSelector.java |   14 +-
 .../webapp/filters/VitroRequestPrep.java      |    8 +-
 .../filters/WebappDaoFactorySDBPrep.java      |  135 ++
 .../vitro/webapp/reasoner/SimpleReasoner.java |  575 ++++++++
 .../support/SimpleReasonerTBoxListener.java   |   39 +
 .../webapp/servlet/setup/AttachSubmodels.java |    3 +-
 .../webapp/servlet/setup/FileGraphSetup.java  |  233 +++
 .../servlet/setup/JenaDataSourceSetup.java    |    2 +
 .../setup/JenaDataSourceSetupBase.java        |   94 +-
 .../servlet/setup/JenaDataSourceSetupSDB.java |  415 ++++++
 .../setup/JenaPersistentDataSourceSetup.java  |    4 +
 .../servlet/setup/SimpleReasonerSetup.java    |  125 ++
 .../webapp/reasoner/SimpleReasonerTest.java   |  312 +++++
 webapp/web/admin/sparqlquery/sparqlForm.jsp   |    4 +-
 37 files changed, 5507 insertions(+), 81 deletions(-)
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB2.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/support/SimpleReasonerTBoxListener.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
 create mode 100644 webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
 create mode 100644 webapp/test/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index 8e7f69fa4..1cc4d26d2 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -108,10 +108,11 @@
   <!-- See documentation for details. -->
   <!-- If used, must be run after JenaDataSourceSetup -->
 
+<!--
   <listener>
     <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.PelletReasonerSetup</listener-class>
   </listener>
-
+-->
 
   <!-- The followng listener records all edit changes, in reified form, to another database model -->
   <!-- still at an experimental stage -->
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
index ed5d24314..d8078c4b9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SparqlQueryServlet.java
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.ontology.OntModelSpec;
 import com.hp.hpl.jena.query.DataSource;
+import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.query.DatasetFactory;
 import com.hp.hpl.jena.query.Query;
 import com.hp.hpl.jena.query.QueryExecution;
@@ -57,9 +58,11 @@ import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 public class SparqlQueryServlet extends BaseEditController {
 
     private static final Log log = LogFactory.getLog(SparqlQueryServlet.class.getName());
+    private static final String kb2 = "http://vitro.mannlib.cornell.edu/default/vitro-kb-2";
 
     protected static final Syntax SYNTAX = Syntax.syntaxARQ;
     
+    
     protected static HashMap<String,ResultSetFormat>formatSymbols = new HashMap<String,ResultSetFormat>();
     static{
         formatSymbols.put( ResultSetFormat.syntaxXML.getSymbol(),     ResultSetFormat.syntaxXML);
@@ -141,6 +144,7 @@ public class SparqlQueryServlet extends BaseEditController {
         }
         
         DataSource dataSource = DatasetFactory.create() ;
+        Dataset dataset = null;
         ModelMaker maker = (ModelMaker) getServletContext().getAttribute("vitroJenaModelMaker");
 
         boolean someModelSet = false;        
@@ -156,21 +160,27 @@ public class SparqlQueryServlet extends BaseEditController {
                 	ontModel.addSubModel(modelNamed);
                     someModelSet = true;
                 }
-            }         
+            }     
+           
             if (someModelSet) {
+            	
             	dataSource.setDefaultModel(ontModel);
             }
+           
         }
         
-        if( ! someModelSet )
-            dataSource.setDefaultModel(model) ;
-        
-        executeQuery(request, response, resultFormatParam, rdfResultFormatParam, queryParam, dataSource); 
+        if( ! someModelSet ){
+            dataset = vreq.getDataset();
+            if(dataset==null){
+            	dataSource.setDefaultModel(model) ;
+            }
+        }
+        executeQuery(request, response, resultFormatParam, rdfResultFormatParam, queryParam, (dataset != null) ? dataset : dataSource); 
         return;
     }
     
     private void executeQuery(HttpServletRequest req,
-            HttpServletResponse response, String resultFormatParam, String rdfResultFormatParam, String queryParam, DataSource dataSource ) throws IOException {
+            HttpServletResponse response, String resultFormatParam, String rdfResultFormatParam, String queryParam, Dataset dataset ) throws IOException {
         
     	ResultSetFormat rsf = null;
     	/* BJL23 2008-11-06
@@ -188,7 +198,7 @@ public class SparqlQueryServlet extends BaseEditController {
         QueryExecution qe = null;
         try{
             Query query = QueryFactory.create(queryParam, SYNTAX);
-            qe = QueryExecutionFactory.create(query, dataSource);
+            qe = QueryExecutionFactory.create(query, dataset);
             if( query.isSelectType() ){
                 ResultSet results = null;
                 results = qe.execSelect();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
index 74e8e4a00..7c0f508fc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
@@ -19,6 +19,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Dataset;
 
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.Portal;
@@ -68,14 +69,31 @@ public class VitroRequest implements HttpServletRequest {
     	return (WebappDaoFactory) getAttribute("webappDaoFactory");
     }
     
+    public void setFullWebappDaoFactory(WebappDaoFactory wdf) {
+    	setAttribute("fullWebappDaoFactory", wdf);
+    }
+    
+    public Dataset getDataset() {
+    	return (Dataset) getAttribute("dataset");
+    }
+    
+    public void setDataset(Dataset dataset) {
+    	setAttribute("dataset", dataset);
+    }
+    
     /** gets assertions + inferences WebappDaoFactory with no filtering **/
     public WebappDaoFactory getFullWebappDaoFactory() {
-        Object webappDaoFactoryAttr = _req.getSession().getAttribute("webappDaoFactory");
-        if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
-             return (WebappDaoFactory) webappDaoFactoryAttr;
-        } else {
-        	return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("webappDaoFactory");	
-        }	
+    	Object webappDaoFactoryAttr = _req.getAttribute("fullWebappDaoFactory");
+    	if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
+    		return (WebappDaoFactory) webappDaoFactoryAttr;
+    	} else {
+	        webappDaoFactoryAttr = _req.getSession().getAttribute("webappDaoFactory");
+	        if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
+	             return (WebappDaoFactory) webappDaoFactoryAttr;
+	        } else {
+	        	return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("webappDaoFactory");	
+	        }
+    	}
     }
     
     /** gets assertions-only WebappDaoFactory with no filtering */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
index 97db38126..d0f1d3373 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesRetryController.java
@@ -5,6 +5,8 @@ package edu.cornell.mannlib.vitro.webapp.controller.edit;
 import java.text.CollationKey;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.text.Collator;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -12,6 +14,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.TreeMap;
+import java.util.ListIterator;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
@@ -73,9 +76,8 @@ public class Properties2PropertiesRetryController extends BaseEditController {
         
     	Collections.sort(propList);
     	
-        String superpropertyURIstr = request.getParameter("SuperpropertyURI");
-        String subpropertyURIstr = request.getParameter("SubpropertyURI");
-        
+    	 String superpropertyURIstr = request.getParameter("SuperpropertyURI");
+         String subpropertyURIstr = request.getParameter("SubpropertyURI");
        
         HashMap<String,Option> hashMap = new HashMap<String,Option>();
         List<Option> optionList = FormUtils.makeOptionListFromBeans(propList,"URI","LocalNameWithPrefix",superpropertyURIstr,null);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
index 128445282..bbdfcb788 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BrowseController.java
@@ -92,6 +92,7 @@ public class BrowseController extends FreemarkerHttpServlet {
 
     	int portalId = vreq.getPortal().getPortalId();
     	List<VClassGroup> groups = getGroups(vreq.getWebappDaoFactory().getVClassGroupDao(), portalId);
+    	_groupListMap.put(portalId, groups);
     	if (groups == null || groups.isEmpty()) {
     		message = "There are not yet any items in the system.";
     	}
@@ -114,13 +115,17 @@ public class BrowseController extends FreemarkerHttpServlet {
     public void destroy(){
         _cacheRebuildThread.kill();
     }
+    
+    private List getGroups( VClassGroupDao vcgDao, int portalId) {
+    	return getGroups( vcgDao, portalId, INCLUDE_INDIVIDUAL_COUNT);
+    }
 
-    private List getGroups( VClassGroupDao vcgDao, int portalId ){
+    private List getGroups( VClassGroupDao vcgDao, int portalId, boolean includeIndividualCount ){
         List grp = _groupListMap.get(portalId);
         if( grp == null ){
             log.debug("needed to build vclassGroups for portal " + portalId);
             // Get all classgroups, each populated with a list of their member vclasses
-            List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED, INCLUDE_INDIVIDUAL_COUNT); 
+            List groups = vcgDao.getPublicGroupsWithVClasses(ORDER_BY_DISPLAYRANK, !INCLUDE_UNINSTANTIATED, includeIndividualCount); 
 
             // remove classes that have been configured to be hidden
             // from search results
@@ -130,7 +135,7 @@ public class BrowseController extends FreemarkerHttpServlet {
             //removeUnpopulatedClasses( groups);
             vcgDao.removeUnpopulatedGroups(groups);
             
-            _groupListMap.put(portalId, groups);
+            //_groupListMap.put(portalId, groups);
             return groups;
         } else {
             return grp;
@@ -212,7 +217,7 @@ public class BrowseController extends FreemarkerHttpServlet {
                        portals.add(wdFactory.getPortalDao().getPortalByURI(uri));
                }
            }
-
+           
            for(Portal portal : portals){
                rebuildCacheForPortal(portal,appBean,wdFactory);
            }
@@ -258,8 +263,55 @@ public class BrowseController extends FreemarkerHttpServlet {
             filteringDaoFactory = wdFactory;
         }
         _groupListMap.remove(portal.getPortalId());
-        getGroups(filteringDaoFactory.getVClassGroupDao(),portal.getPortalId());
+        if ( !singlePortalApplication ) {
+	        _groupListMap.put(portal.getPortalId(), 
+	        		getGroups(filteringDaoFactory.getVClassGroupDao(),portal.getPortalId()));
+        } else {
+        	List<VClassGroup> unfilteredGroups = getGroups(wdFactory.getVClassGroupDao(), portal.getPortalId(), INCLUDE_INDIVIDUAL_COUNT);
+        	List<VClassGroup> filteredGroups = getGroups(filteringDaoFactory.getVClassGroupDao(),portal.getPortalId(), !INCLUDE_INDIVIDUAL_COUNT);
+        	_groupListMap.put(portal.getPortalId(), removeFilteredOutGroupsAndClasses(unfilteredGroups, filteredGroups));
+        	// BJL23:  You may be wondering, why this extra method?  
+        	// Can't we just use the filtering DAO?
+        	// Yes, but using the filtered DAO involves an expensive method
+        	// called correctVClassCounts() that requires each individual
+        	// in a VClass to be retrieved and filtered.  This is fine in memory,
+        	// but awful when using a database.  We can't (yet) avoid all
+        	// this work when portal filtering is involved, but we can
+        	// short-circuit it when we have a single portal by using
+        	// the filtering DAO only to filter groups and classes,
+        	// and the unfiltered DAO to get the counts.
+        }
     }
+    
+    private List<VClassGroup> removeFilteredOutGroupsAndClasses(List<VClassGroup> unfilteredGroups, List<VClassGroup> filteredGroups) {
+    	List<VClassGroup> groups = new ArrayList<VClassGroup>();
+    	Set<String> allowedGroups = new HashSet<String>();
+    	Set<String> allowedVClasses = new HashSet<String>();
+    	for (VClassGroup group : filteredGroups) {
+    		if (group.getURI() != null) {
+    			allowedGroups.add(group.getURI());
+    		}
+    		for (VClass vcl : group) {
+    			if (vcl.getURI() != null) {
+    				allowedVClasses.add(vcl.getURI());
+    			}
+    		}
+    	}
+    	for (VClassGroup group : unfilteredGroups) {
+    		if (allowedGroups.contains(group.getURI())) {
+    			groups.add(group);
+    		}
+    		List<VClass> tmp = new ArrayList<VClass>();
+    		for (VClass vcl : group) {
+    			if (allowedVClasses.contains(vcl.getURI())) {
+    				tmp.add(vcl);
+    			}
+    		}
+    		group.setVitroClassList(tmp);
+    	}
+    	return groups;
+    }
+    
 
     private void clearGroupCache(){
         _groupListMap = new ConcurrentHashMap<Integer, List>();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
index c19d2868e..7ed6abf9d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java
@@ -33,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSpecialModelMaker;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
@@ -155,10 +156,12 @@ public class RDFUploadController extends BaseEditController {
 		if( tempModel != null ){
 		    OntModel memModel=null;
 		    try {
-		        memModel = (OntModel) request.getSession().getAttribute("baseOntModel");
+		        memModel = ((OntModelSelector) request.getSession()
+            			.getAttribute("unionOntModelSelector")).getABoxModel();
 		    } catch (Exception e) {}
 		    if (memModel==null) {
-		        memModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+		        memModel = ((OntModelSelector) getServletContext()
+            			.getAttribute("unionOntModelSelector")).getABoxModel();
 		    }
 		    if (memModel != null) {
 		        stmtCount = operateOnModel(request.getFullWebappDaoFactory(), memModel,tempModel,remove,makeClassgroups,portalArray,loginBean.getUserURI());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
index 04b171315..e11ccddf8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/VClassDaoFiltering.java
@@ -221,6 +221,7 @@ public class VClassDaoFiltering extends BaseFiltering implements VClassDao{
         Filter.filter(ents,filters.getIndividualFilter(),out);
         if( out != null )
             vclass.setEntityCount(out.size());
+        System.out.println(vclass.getURI() + " count: " + vclass.getEntityCount());
         return;
     }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
index fff4c4e5b..b31ab637e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoJena.java
@@ -66,9 +66,10 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         }
         else
         {
-            getOntModel().enterCriticalSection(Lock.READ);
+        	OntModel ontModel = getOntModelSelector().getABoxModel();
+            ontModel.enterCriticalSection(Lock.READ);
             try {
-                Resource ind = getOntModel().getResource(entity.getURI());
+                Resource ind = ontModel.getResource(entity.getURI());
                 List<DataPropertyStatement> edList = new ArrayList<DataPropertyStatement>();
                 StmtIterator stmtIt = ind.listProperties();
                 while( stmtIt.hasNext() )
@@ -103,7 +104,7 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
                 entity.setDataPropertyStatements(edList);
                 return entity;
             } finally {
-                getOntModel().leaveCriticalSection();
+                ontModel.leaveCriticalSection();
             }
         }
     }
@@ -234,14 +235,14 @@ public class DataPropertyStatementDaoJena extends JenaBaseDao implements DataPro
         return 0;
     }
     
-    private DataPropertyStatement fillDataPropertyStatementWithJenaLiteral(DataPropertyStatement dataPropertyStatement, Literal l) {
+    protected DataPropertyStatement fillDataPropertyStatementWithJenaLiteral(DataPropertyStatement dataPropertyStatement, Literal l) {
     	dataPropertyStatement.setData(l.getLexicalForm());
         dataPropertyStatement.setDatatypeURI(l.getDatatypeURI());
         dataPropertyStatement.setLanguage(l.getLanguage());
         return dataPropertyStatement;
     }
     
-    private Literal jenaLiteralFromDataPropertyStatement(DataPropertyStatement dataPropertyStatement, OntModel ontModel) {
+    protected Literal jenaLiteralFromDataPropertyStatement(DataPropertyStatement dataPropertyStatement, OntModel ontModel) {
     	Literal l = null;
         if ((dataPropertyStatement.getLanguage()) != null && (dataPropertyStatement.getLanguage().length()>0)) {
         	l = ontModel.createLiteral(dataPropertyStatement.getData(),dataPropertyStatement.getLanguage());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
new file mode 100644
index 000000000..91af6bb34
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyStatementDaoSDB.java
@@ -0,0 +1,100 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+public class DataPropertyStatementDaoSDB extends DataPropertyStatementDaoJena
+							implements DataPropertyStatementDao {
+
+	private Dataset dataset;
+	
+	public DataPropertyStatementDaoSDB(Dataset dataset, WebappDaoFactoryJena wadf) {
+		super (wadf);
+		this.dataset = dataset;
+	}
+	
+	@Override
+	public Individual fillExistingDataPropertyStatementsForIndividual( Individual entity/*, boolean allowAnyNameSpace*/)
+    {
+        if( entity.getURI() == null )
+        {
+            return entity;
+        }
+        else
+        {
+        	String query = 
+	        	"CONSTRUCT { \n" +
+			       "   <" + entity.getURI() + "> ?p ?o . \n" +
+			       "} WHERE { GRAPH ?g { \n" +
+			       "   <" + entity.getURI() + "> ?p ?o . \n" +
+			       "   FILTER(isLiteral(?o)) \n" +
+	            "} }" ;
+        	Model results = QueryExecutionFactory.create(QueryFactory.create(query), dataset).execConstruct();
+        	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, results); 
+            ontModel.enterCriticalSection(Lock.READ);
+            try {
+                Resource ind = ontModel.getResource(entity.getURI());
+                List<DataPropertyStatement> edList = new ArrayList<DataPropertyStatement>();
+                StmtIterator stmtIt = ind.listProperties();
+                while( stmtIt.hasNext() )
+                {
+                    Statement st = (Statement)stmtIt.next();
+                    boolean addToList = /*allowAnyNameSpace ? st.getObject().canAs(Literal.class) :*/ st.getObject().isLiteral() && 
+                          (
+                              (RDF.value.equals(st.getPredicate()) || VitroVocabulary.value.equals(st.getPredicate().getURI())) 
+                              || !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))
+                          );
+                    if( addToList )
+                    {   /* now want to expose Cornellemailnetid and potentially other properties so can at least control whether visible
+                        boolean isExternalId = false;
+                        ClosableIterator externalIdStmtIt = getOntModel().listStatements(st.getPredicate(), DATAPROPERTY_ISEXTERNALID, (Literal)null);
+                        try {
+                            if (externalIdStmtIt.hasNext()) {
+                                isExternalId = true;
+                            }
+                        } finally {
+                            externalIdStmtIt.close();
+                        }
+                        if (!isExternalId) { */
+                        DataPropertyStatement ed = new DataPropertyStatementImpl();
+                        Literal lit = (Literal)st.getObject();
+                        fillDataPropertyStatementWithJenaLiteral(ed,lit);
+                        ed.setDatapropURI(st.getPredicate().getURI());
+                        ed.setIndividualURI(ind.getURI());
+                        edList.add(ed);
+                     /* } */
+                    }
+                }
+                entity.setDataPropertyStatements(edList);
+                return entity;
+            } finally {
+                ontModel.leaveCriticalSection();
+            }
+        }
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
index 0a864b6a5..d8b1b0f70 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java
@@ -151,16 +151,19 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
             ? getOntModel().createResource(new AnonId(vclassURI.split("#")[1]))
             : ResourceFactory.createResource(vclassURI);
     
-        getOntModel().enterCriticalSection(Lock.READ);
-        try {
-            if (theClass.isAnon() && theClass.canAs(UnionClass.class)) {
-            	UnionClass u = (UnionClass) theClass.as(UnionClass.class);
-            	for (OntClass operand : u.listOperands().toList()) {
-            		VClass vc = new VClassJena(operand, getWebappDaoFactory());
-            		ents.addAll(getIndividualsByVClass(vc));
-            	}
-            } else {
-	            StmtIterator stmtIt = getOntModel().listStatements((Resource) null, RDF.type, theClass);
+        
+        
+        if (theClass.isAnon() && theClass.canAs(UnionClass.class)) {
+        	UnionClass u = (UnionClass) theClass.as(UnionClass.class);
+        	for (OntClass operand : u.listOperands().toList()) {
+        		VClass vc = new VClassJena(operand, getWebappDaoFactory());
+        		ents.addAll(getIndividualsByVClass(vc));
+        	}
+        } else {
+        	OntModel ontModel = getOntModelSelector().getABoxModel();
+        	try {
+        		ontModel.enterCriticalSection(Lock.READ);
+	            StmtIterator stmtIt = ontModel.listStatements((Resource) null, RDF.type, theClass);
 	            try {
 	                while (stmtIt.hasNext()) {
 	                    Statement stmt = stmtIt.nextStatement();
@@ -170,10 +173,11 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
 	            } finally {
 	                stmtIt.close();
 	            }
-            }
-        } finally {
-            getOntModel().leaveCriticalSection();
+        	} finally {
+        		ontModel.leaveCriticalSection();
+        	}
         }
+        
 
         java.util.Collections.sort(ents);
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
new file mode 100644
index 000000000..4c4c1dd31
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoSDB.java
@@ -0,0 +1,444 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+
+import com.hp.hpl.jena.ontology.OntClass;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.UnionClass;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.AnonId;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.ResIterator;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+public class IndividualDaoSDB extends IndividualDaoJena {
+
+	private Dataset dataset;
+	private WebappDaoFactoryJena wadf;
+	
+    public IndividualDaoSDB(Dataset dataset, WebappDaoFactoryJena wadf) {
+        super(wadf);
+        this.dataset = dataset;
+    }
+    
+    protected Dataset getDataset() {
+    	return this.dataset;
+    }
+    
+    protected Individual makeIndividual(String individualURI) {
+    	return new IndividualSDB2(individualURI, getDataset(), getWebappDaoFactory());
+    }
+
+    private static final Log log = LogFactory.getLog(IndividualDaoSDB.class.getName());
+
+    @Override
+    protected OntModel getOntModel() {
+    	return getOntModelSelector().getABoxModel();
+    }
+    
+    @Override
+    public List getIndividualsByVClassURI(String vclassURI, int offset, int quantity ) {
+
+    	if (vclassURI==null) {
+            return null;
+        }
+        
+        List ents = new ArrayList();
+        
+        Resource theClass = (vclassURI.indexOf(PSEUDO_BNODE_NS) == 0) 
+            ? getOntModel().createResource(new AnonId(vclassURI.split("#")[1]))
+            : ResourceFactory.createResource(vclassURI);
+    
+        if (theClass.isAnon() && theClass.canAs(UnionClass.class)) {
+        	UnionClass u = (UnionClass) theClass.as(UnionClass.class);
+        	for (OntClass operand : u.listOperands().toList()) {
+        		VClass vc = new VClassJena(operand, getWebappDaoFactory());
+        		ents.addAll(getIndividualsByVClass(vc));
+        	}
+        } else {
+        	Model model;
+        	dataset.getLock().enterCriticalSection(Lock.READ);
+        	try {
+        		String query = 
+    	    		"CONSTRUCT " +
+    	    		"{ ?ind  <" + RDFS.label.getURI() + "> ?ooo. \n" +
+    	    		   "?ind  a <" + theClass.getURI() + "> . \n" +
+    	    		   "?ind  <" + VitroVocabulary.MONIKER + "> ?moniker \n" +
+    	    		 "} WHERE " +
+    	    		 "{ GRAPH ?g { \n" +
+    	    		    " ?ind a <" + theClass.getURI() + ">  \n" +
+    	    		 	"OPTIONAL { ?ind  <" + RDFS.label.getURI() + "> ?ooo } \n" +
+    	    		 	"OPTIONAL { ?ind  <" + VitroVocabulary.MONIKER + "> ?moniker } \n" +
+    	    		 	"} \n" +
+    	    		 "}";
+        		model = QueryExecutionFactory.create(QueryFactory.create(query), dataset).execConstruct();
+        	} finally {
+        		dataset.getLock().leaveCriticalSection();
+        	}
+            ResIterator resIt = model.listSubjects();
+            try {
+                while (resIt.hasNext()) {
+                    Resource ind = resIt.nextResource();
+                    if (!ind.isAnon()) {
+                    	ents.add(new IndividualSDB(ind.getURI(), dataset, getWebappDaoFactory(), model));
+                    }
+                }
+            } finally {
+                resIt.close();
+            }	
+        }
+     
+
+        java.util.Collections.sort(ents);
+        
+        return ents;
+
+    }
+	
+    @Override
+    public Individual getIndividualByURI(String entityURI) {
+        if( entityURI == null || entityURI.length() == 0 ) {
+            return null;
+        } else {
+        	return makeIndividual(entityURI);	
+        }
+    }  
+    
+    /**
+     * fills in the Individual objects needed for any ObjectPropertyStatements attached to the specified individual.
+     * @param entity
+     */
+    private void fillIndividualsForObjectPropertyStatements(Individual entity){
+        getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            Iterator e2eIt = entity.getObjectPropertyStatements().iterator();
+            while (e2eIt.hasNext()) {
+                ObjectPropertyStatement e2e = (ObjectPropertyStatement) e2eIt.next();
+                e2e.setSubject(makeIndividual(e2e.getSubjectURI()));
+                e2e.setObject(makeIndividual(e2e.getObjectURI()));       
+            }
+        } finally {
+            getOntModel().leaveCriticalSection();
+        }
+    }
+    
+    /**
+     * In Jena it can be difficult to get an object with a given dataproperty if
+     * you do not care about the datatype or lang of the literal.  Use this
+     * method if you would like to ignore the lang and datatype.  
+     */
+    @Override
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value){        
+        Property prop = null;
+        if( RDFS.label.getURI().equals( dataPropertyUri )){
+            prop = RDFS.label;
+        }else{
+            prop = getOntModel().getDatatypeProperty(dataPropertyUri);
+        }
+
+        if( prop == null ) {            
+            log.debug("Could not getIndividualsByDataProperty() " +
+                    "because " + dataPropertyUri + "was not found in model.");
+            return Collections.emptyList();
+        }
+
+        if( value == null ){
+            log.debug("Could not getIndividualsByDataProperty() " +
+                    "because value was null");
+            return Collections.emptyList();
+        }
+        
+        Literal litv1 = getOntModel().createLiteral(value);        
+        Literal litv2 = getOntModel().createTypedLiteral(value);   
+        
+        //warning: this assumes that any language tags will be EN
+        Literal litv3 = getOntModel().createLiteral(value,"EN");        
+        
+        HashMap<String,Individual> individualsMap = new HashMap<String, Individual>();
+                
+        getOntModel().enterCriticalSection(Lock.READ);
+        int count = 0;
+        try{
+            StmtIterator stmts
+                = getOntModel().listStatements((Resource)null, prop, litv1);                                           
+            while(stmts.hasNext()){
+                count++;
+                Statement stmt = stmts.nextStatement();
+                
+                RDFNode sub = stmt.getSubject();
+                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
+                    continue;                
+                
+                RDFNode obj = stmt.getObject();
+                if( obj == null || !obj.isLiteral() )
+                    continue;
+                
+                Literal literal = (Literal)obj;
+                Object v = literal.getValue();
+                if( v == null )                     
+                    continue;                
+                
+                String subUri = ((Resource)sub).getURI();
+                if( ! individualsMap.containsKey(subUri)){
+                    individualsMap.put(subUri,makeIndividual(subUri));
+                }
+            }
+            
+            stmts = getOntModel().listStatements((Resource)null, prop, litv2);                                           
+            while(stmts.hasNext()){
+                count++;
+                Statement stmt = stmts.nextStatement();
+                
+                RDFNode sub = stmt.getSubject();
+                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
+                    continue;                
+                
+                RDFNode obj = stmt.getObject();
+                if( obj == null || !obj.isLiteral() )
+                    continue;
+                
+                Literal literal = (Literal)obj;
+                Object v = literal.getValue();
+                if( v == null )                     
+                    continue;                
+                
+                String subUri = ((Resource)sub).getURI();
+                if( ! individualsMap.containsKey(subUri)){
+                    individualsMap.put(subUri, makeIndividual(subUri));
+                }                
+            }
+            
+            stmts = getOntModel().listStatements((Resource)null, prop, litv3);                                           
+            while(stmts.hasNext()){
+                count++;
+                Statement stmt = stmts.nextStatement();
+                
+                RDFNode sub = stmt.getSubject();
+                if( sub == null || sub.isAnon() || sub.isLiteral() )                    
+                    continue;                
+                
+                RDFNode obj = stmt.getObject();
+                if( obj == null || !obj.isLiteral() )
+                    continue;
+                
+                Literal literal = (Literal)obj;
+                Object v = literal.getValue();
+                if( v == null )                     
+                    continue;                
+                
+                String subUri = ((Resource)sub).getURI();
+                if( ! individualsMap.containsKey(subUri)){
+                    individualsMap.put(subUri, makeIndividual(subUri));
+                }                
+            }
+        } finally {
+            getOntModel().leaveCriticalSection();
+        }
+        
+        List<Individual> rv = new ArrayList(individualsMap.size());
+        rv.addAll(individualsMap.values());
+        return rv;
+    }
+    
+    @Override
+    public Iterator getAllOfThisTypeIterator() {
+        final List<String> list = 
+            new LinkedList<String>();
+        
+        String query = "SELECT ?ind WHERE { \n" +
+                       "  GRAPH ?g { ?ind <" + RDFS.label.getURI() + "> ?label } \n" +
+                       "}";
+        
+        
+	    Query q = QueryFactory.create(query);
+	    QueryExecution qe = QueryExecutionFactory.create(q, dataset);
+	    try {
+	        ResultSet rs = qe.execSelect();
+	        while (rs.hasNext()) {
+	        	Resource res = rs.next().getResource("ind");
+	        	if (!res.isAnon()) {
+	        		list.add(res.getURI());
+	        	}
+	        }
+        } finally {
+        	qe.close(); 
+        }
+        
+//        getOntModel().enterCriticalSection(Lock.READ);
+//        try {
+//            ClosableIterator allIndIt = getOntModel().listIndividuals();
+//            try {
+//                while (allIndIt.hasNext()) {
+//                    com.hp.hpl.jena.ontology.Individual ind = (com.hp.hpl.jena.ontology.Individual) allIndIt.next();
+//                    
+//                    
+//                    
+//                    //don't include anything that lacks a label, issue VIVO-119.
+//                    if( getLabel(ind) == null )
+//                        continue;
+//                    
+//                    
+//                    boolean userVisible = true;
+//                    //Check for non-user visible types, maybe this should be an annotation?
+//                    ClosableIterator typeIt = ind.listRDFTypes(false);
+//                    try {
+//                        while (typeIt.hasNext()) {
+//                            Resource typeRes = (Resource) typeIt.next();
+//                            String type = typeRes.getURI();
+//                            // brute forcing this until we implement a better strategy
+//                            if (VitroVocabulary.PORTAL.equals(type) || 
+//                            	VitroVocabulary.TAB.equals(type) ||
+//                            	VitroVocabulary.TAB_INDIVIDUALRELATION.equals(type) ||
+//                            	VitroVocabulary.LINK.equals(type) ||
+//                            	VitroVocabulary.KEYWORD.equals(type) ||
+//                            	VitroVocabulary.KEYWORD_INDIVIDUALRELATION.equals(type) ||
+//                            	VitroVocabulary.CLASSGROUP.equals(type) ||
+//                            	VitroVocabulary.PROPERTYGROUP.equals(type) ||
+//                            	VitroVocabulary.APPLICATION.equals(type)) {    	
+//                                userVisible = false;
+//                                break;
+//                            }
+//                            if( OWL.ObjectProperty.getURI().equals(type) ||
+//                            	OWL.DatatypeProperty.getURI().equals(type) ||
+//                            	OWL.AnnotationProperty.getURI().equals(type) ||
+//                            	RDF.type.getURI().equals(type) ){
+//                            	userVisible = false;
+//                            	break;
+//                        	} 
+//                        }
+//                    } finally {
+//                        typeIt.close();
+//                    }
+//                    if (userVisible) {
+//                        list.add(ind);
+//                    }
+//                    
+//                }
+//            } finally {
+//                allIndIt.close();
+//            }
+//        } finally {
+//            getOntModel().leaveCriticalSection();
+//        }
+        if (list.size() >0){
+            return new Iterator(){
+                Iterator<String> innerIt = list.iterator();
+                public boolean hasNext() { 
+                    return innerIt.hasNext();                    
+                }
+                public Object next() {
+                    return makeIndividual(innerIt.next());
+                }
+                public void remove() {
+                    //not used
+                }            
+            };
+        }
+        else
+            return null;
+    }  
+
+    @Override
+    public Iterator getAllOfThisVClassIterator(String vClassURI) {
+        getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            List ents = new LinkedList();
+            OntClass cls = getOntModel().getOntClass(vClassURI);
+            Iterator indIt = cls.listInstances();
+            while (indIt.hasNext()) {
+                com.hp.hpl.jena.ontology.Individual ind = (com.hp.hpl.jena.ontology.Individual) indIt.next();
+                ents.add(makeIndividual(ind.getURI()));
+            }
+            return ents.iterator();
+        } finally {
+            getOntModel().leaveCriticalSection();
+        }
+    }
+
+    @Override
+    public Iterator getUpdatedSinceIterator(long updatedSince){
+        List ents = new ArrayList();
+        Date since = new DateTime(updatedSince).toDate();
+        String sinceStr = xsdDateTimeFormat.format(since);
+        getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            Property modTimeProp = MODTIME;
+            if (modTimeProp == null)
+                modTimeProp = getOntModel().getProperty(VitroVocabulary.MODTIME);
+            if (modTimeProp == null)
+                return null; // throw an exception?
+            String queryStr = "PREFIX vitro: <"+ VitroVocabulary.vitroURI+"> " +
+                              "PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>" +
+                              "SELECT ?ent " +
+                              "WHERE { " +
+                              "     ?ent vitro:modTime ?modTime ." +
+                              "     FILTER (xsd:dateTime(?modTime) >= \""+sinceStr+"\"^^xsd:dateTime) " +
+                              "}";
+            Query query = QueryFactory.create(queryStr);
+            QueryExecution qe = QueryExecutionFactory.create(query,getOntModel());
+            ResultSet results = qe.execSelect();
+            while (results.hasNext()) {
+                QuerySolution qs = (QuerySolution) results.next();
+                Resource res = (Resource) qs.get("?ent");
+                com.hp.hpl.jena.ontology.Individual ent = getOntModel().getIndividual(res.getURI());
+                if (ent != null) {
+                    boolean userVisible = false;
+                    ClosableIterator typeIt = ent.listRDFTypes(true);
+                    try {
+                        while (typeIt.hasNext()) {
+                            Resource typeRes = (Resource) typeIt.next();
+                            if (typeRes.getNameSpace() == null || (!NONUSER_NAMESPACES.contains(typeRes.getNameSpace()))) {
+                                userVisible = true;
+                                break;
+                            }
+                        }
+                    } finally {
+                        typeIt.close();
+                    }
+                    if (userVisible) {
+                        ents.add(makeIndividual(ent.getURI()));
+                    }
+                }
+            }
+        } finally {
+            getOntModel().leaveCriticalSection();
+        }
+        return ents.iterator();
+    }
+
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
new file mode 100644
index 000000000..37a1bde51
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java
@@ -0,0 +1,1248 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.sql.Timestamp;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.ontology.OntResource;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.NodeIterator;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.ResIterator;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.Keyword;
+import edu.cornell.mannlib.vitro.webapp.beans.Link;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
+import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
+import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
+
+public class IndividualSDB extends IndividualImpl implements Individual {
+
+    private static final Log log = LogFactory.getLog(IndividualSDB.class.getName());
+    private OntResource ind = null;
+    private WebappDaoFactoryJena webappDaoFactory = null;
+    private Float _searchBoostJena = null;
+    private boolean retreivedNullRdfsLabel = false;
+    private Dataset dataset = null;
+    private String individualURI = null; 
+    private Model model = null;
+    
+    public IndividualSDB(String individualURI, Dataset dataset, WebappDaoFactoryJena wadf, Model initModel) {
+    	this.individualURI = individualURI;
+    	this.dataset = dataset;
+      
+    	try {
+	    	initModel.getLock().enterCriticalSection(Lock.READ);
+	    	String getStatements = 
+	    		"CONSTRUCT \n" +
+	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() + "> ?ooo. \n" +
+	    		   "<"+individualURI+">  a ?type . \n" +
+	    		   "<"+individualURI+"> <" + VitroVocabulary.MONIKER + "> ?moniker \n" +
+	    		 "} \n" +
+	    		 "WHERE { \n" +
+	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() + "> ?ooo }  \n" +
+	    		 	" UNION { <"+individualURI+"> a ?type } \n" +
+	    		 	" UNION { <"+individualURI+"> <" + VitroVocabulary.MONIKER + "> ?moniker } \n" +
+	    		 "} "; 
+    		this.model = QueryExecutionFactory.create(QueryFactory.create(getStatements), initModel).execConstruct();
+    	} finally {
+    		initModel.getLock().leaveCriticalSection();
+    	}
+    	
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, model);
+    	this.ind = ontModel.createOntResource(individualURI);  
+    	
+    	if (ind != null) {
+	        if (ind.isAnon()) {
+	        	this.setNamespace(VitroVocabulary.PSEUDO_BNODE_NS);
+	        	this.setLocalName(ind.getId().toString());
+	        } else {
+	        	this.URI = ind.getURI();
+	        	this.namespace = ind.getNameSpace();
+	        	this.localName = ind.getLocalName();
+	        }
+    	} else if (individualURI != null) {
+    		log.warn("Null individual returned for URI " + individualURI);
+    	}
+        this.webappDaoFactory = wadf;
+    }
+    
+    public IndividualSDB(String individualURI, Dataset dataset, WebappDaoFactoryJena wadf) {
+    	this.individualURI = individualURI;
+    	this.dataset = dataset;
+    	
+    	try {
+	    	this.dataset.getLock().enterCriticalSection(Lock.READ);
+	    	String getStatements = 
+	    		"CONSTRUCT " +
+	    		"{ <"+individualURI+">  <" + RDFS.label.getURI() + "> ?ooo. \n" +
+	    		   "<"+individualURI+">  a ?type . \n" +
+	    		   "<"+individualURI+">  <" + VitroVocabulary.MONIKER + "> ?moniker \n" +
+	    		 "} WHERE {" +
+	    		 "{ GRAPH ?g { \n" +
+	    		 	"{ <"+individualURI+">  <" + RDFS.label.getURI() + "> ?ooo } \n" +
+	    		 	"UNION { <"+individualURI+">  <" + VitroVocabulary.MONIKER + "> ?moniker } \n" +
+	    		 	"} \n" +
+	    		 	"} UNION { GRAPH <http://vitro.mannlib.cornell.edu/default/vitro-kb-2> { <"+individualURI+"> a ?type } } \n" +
+	    		 "}";
+    		model = QueryExecutionFactory.create(QueryFactory.create(getStatements), dataset).execConstruct();
+    	} finally {
+    		this.dataset.getLock().leaveCriticalSection();
+    	}
+    	
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, model);
+    	
+    	this.ind = ontModel.createOntResource(individualURI);  
+    	
+    	if (ind != null) {
+	        if (ind.isAnon()) {
+	        	this.setNamespace(VitroVocabulary.PSEUDO_BNODE_NS);
+	        	this.setLocalName(ind.getId().toString());
+	        } else {
+	        	this.URI = ind.getURI();
+	        	this.namespace = ind.getNameSpace();
+	        	this.localName = ind.getLocalName();
+	        }
+    	} else if (individualURI != null) {
+    		log.warn("Null individual returned for URI " + individualURI);
+    	}
+        this.webappDaoFactory = wadf;
+    }
+
+    public String getName() { 
+        if (this.name != null) {
+            return name;
+        } else {
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+        	
+            try {
+                this.name = webappDaoFactory.getJenaBaseDao().getLabelOrId(ind);
+                if (this.name == null) {
+                    this.name = "[null]";
+                }
+                return this.name;
+          
+            } finally {
+              
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getRdfsLabel() { 
+        if (this.rdfsLabel != null) {
+            return rdfsLabel;
+        } else if( this.rdfsLabel == null && retreivedNullRdfsLabel ){
+        	return null;
+        } else { 
+           
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                this.rdfsLabel = webappDaoFactory.getJenaBaseDao().getLabel(ind);
+                retreivedNullRdfsLabel = this.rdfsLabel == null;
+                return this.rdfsLabel;
+            } finally {
+               
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+    
+	public String getVClassURI() { 
+        if (this.vClassURI != null) {
+            return vClassURI;
+        } else {
+        	List<VClass> clist = getVClasses(true);
+        	return (clist.size() > 0) ? clist.get(0).getURI() : null; 
+        }
+    }
+
+    public VClass getVClass() {
+        if (this.vClass != null) {
+            return this.vClass;
+        } else {
+        	List<VClass> clist = getVClasses(true);
+            return (clist.size() > 0) ? clist.get(0) : null ; 
+        } 
+    }
+
+    public int getFlag1Numeric() { 
+        if (flag1Numeric > -1) {
+            return flag1Numeric;
+        } else {
+            doFlag1();
+            return flag1Numeric;
+        }
+    }
+ 
+    public String getFlag1Set() { 
+        if (flag1Set != null) {
+            return flag1Set;
+        } else {
+            doFlag1();
+            return flag1Set;
+        }
+    }
+
+    public String getFlag2Set() { 
+        if (flag2Set != null) {
+            return flag2Set;
+        } else {
+            doFlag2();
+            return flag2Set;
+        }
+    }
+
+    /* Consider the flagBitMask as a mask to & with flags.
+   if flagBitMask bit zero is set then return true if
+   the individual is in portal 2,
+   if flagBitMask bit 1 is set then return true if
+   the individua is in portal 4
+   etc.
+   Portal uris look like this:
+   "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Flag1Value1Thing"
+    */
+    public boolean doesFlag1Match(int flagBitMask) { 
+        Long [] numerics = FlagMathUtils.numeric2numerics(flagBitMask);        
+        this.dataset.getLock().enterCriticalSection(Lock.READ);
+        String Ask = null;
+        
+        try{
+            for( Long numericPortal : numerics){
+                int portalid = FlagMathUtils.numeric2Portalid(numericPortal);
+                String portalTypeUri = VitroVocabulary.vitroURI + "Flag1Value" + portalid + "Thing";
+                Ask = "ASK { GRAPH ?g { <" + this.individualURI + "> <" +RDF.type+ "> <" + portalTypeUri +">} }"; 
+                if(!QueryExecutionFactory.create(QueryFactory.create(Ask), dataset).execAsk())
+                	return false;
+            }
+        }finally{
+           
+        	this.dataset.getLock().leaveCriticalSection();
+        }
+        return true;
+    }
+
+    private void doFlag1() {
+       
+    	String getObjects = null;
+    	
+        dataset.getLock().enterCriticalSection(Lock.READ);
+        Model tempModel = ModelFactory.createDefaultModel();
+        OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        try {
+        	ClosableIterator typeIt = null;
+            int portalNumeric = 0;
+            String portalSet = "";
+            try{
+            	getObjects = 
+            		"CONSTRUCT{<" + this.individualURI + "> <" + RDF.type + "> ?object}" +
+        			"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + RDF.type + "> ?object} }";
+        		tempModel = QueryExecutionFactory.create(QueryFactory.create(getObjects), dataset).execConstruct();
+        		ontModel.add(tempModel.listStatements());
+        	    OntResource ontRes = ontModel.createOntResource(this.individualURI);
+        	    typeIt = ontRes.getOntModel().listStatements(ontRes, RDF.type ,(String) null);
+        	    while (typeIt.hasNext()) {
+                    Statement stmt = (Statement) typeIt.next();
+                    Resource type = (Resource)stmt.getObject();
+                    String typeName = type.getLocalName();
+                    if(type.getNameSpace() != null && type.getNameSpace().equals(VitroVocabulary.vitroURI) && typeName.indexOf("Flag1Value")==0) {
+                        try {
+                            int portalNumber = Integer.decode(typeName.substring(10,typeName.length()-5));
+                            portalNumeric = portalNumeric | (1 << portalNumber);
+                            if (portalSet.length() > 0) {
+                                portalSet+=",";
+                            }
+                            portalSet+=Integer.toString(portalNumber);
+                        } catch (Exception e) {}
+                    }
+                }
+            }finally{
+                if( typeIt != null ) typeIt.close() ;
+            }
+            flag1Set = portalSet;
+            flag1Numeric = portalNumeric;
+        } finally {
+            tempModel.close();
+            ontModel.close();
+        	this.dataset.getLock().leaveCriticalSection();
+        }
+    }
+
+    
+    private void doFlag2() {
+    	String getObjects = null;
+    	dataset.getLock().enterCriticalSection(Lock.READ);
+    	Model tempModel = ModelFactory.createDefaultModel();
+        OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        try {
+            ClosableIterator typeIt=null;
+            String flagSet = "";
+            try{
+            	getObjects = 
+            		"CONSTRUCT{<" + this.individualURI + "> <" + RDF.type + "> ?object}" +
+        			"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + RDF.type + "> ?object} }";
+        		tempModel = QueryExecutionFactory.create(QueryFactory.create(getObjects), dataset).execConstruct();
+        		ontModel.add(tempModel.listStatements());
+        	    OntResource ontRes = ontModel.createOntResource(this.individualURI);
+        	    typeIt = ontRes.getOntModel().listStatements(ontRes, RDF.type ,(String) null);
+        	    while (typeIt.hasNext()) {
+                    Statement stmt = (Statement) typeIt.next();
+                    Resource type = (Resource)stmt.getObject();
+                    String typeName = type.getLocalName();
+                    if(type.getNameSpace() != null && type.getNameSpace().equals(VitroVocabulary.vitroURI) && typeName.indexOf("Flag2Value")==0) {
+                        try {
+                            String flagValue = ((WebappDaoFactoryJena)webappDaoFactory).getFlag2ClassLabelMap().get(type);
+                            if (flagSet.length() > 0) {
+                                flagSet+=",";
+                            }
+                            flagSet+=flagValue;
+                        } catch (Exception e) {}
+                    }
+                }
+            }finally{
+                if( typeIt != null ) typeIt.close() ;
+            }
+            flag2Set = flagSet;
+        } finally {
+        	tempModel.close();
+            ontModel.close();
+        	this.dataset.getLock().leaveCriticalSection();
+        }
+    }
+
+
+    public Date getSunrise() { 
+        if (sunrise != null) {
+            return sunrise;
+        } else {
+          
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                sunrise = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().SUNRISE);
+                return sunrise;
+            } finally {
+               
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Date getSunset() { 
+        if (sunset != null) {
+            return sunset;
+        } else {
+           
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                sunset = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().SUNSET);
+                return sunset;
+            } finally {
+                
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Date getTimekey() { 
+        if (timekey != null) {
+            return timekey;
+        } else {
+            
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                timekey = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().TIMEKEY);
+                return timekey;
+            } finally {
+              
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Timestamp getModTime() {
+        if (modTime != null) {
+            return modTime;
+        } else {
+           
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                Date modDate = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().MODTIME);
+                if (modDate != null) {
+                    modTime = new Timestamp(modDate.getTime());
+                }
+                return modTime;
+            } finally {
+               
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getMoniker() { 
+        if (moniker != null) {
+            return moniker;
+        } else {         
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                moniker = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().MONIKER);
+                if (moniker == null) {
+                	try {
+                        // trying to deal with the fact that an entity may have more than 1 VClass
+                        List<VClass> clasList = this.getVClasses(true);
+                        if (clasList == null || clasList.size() < 2) {
+                            moniker = getVClass().getName();
+                        } else {
+                            VClass preferredClass = null;
+                            for (VClass clas : clasList) {
+                                if (clas.getCustomDisplayView() != null && clas.getCustomDisplayView().length()>0) {
+                                    // arbitrarily deciding that the preferred class (could be >1) is one with a custom view
+                                    preferredClass = clas;
+                                    log.debug("Found direct class ["+clas.getName()+"] with custom view "+clas.getCustomDisplayView()+"; resetting entity vClass to this class");
+                                }
+                            }
+                            if (preferredClass == null) {
+                                // no basis for selecting a preferred class name to use
+                                moniker = null; // was this.getVClass().getName();
+                            } else {
+                                 preferredClass.getName();
+                            }
+                        }
+                	} catch (Exception e) {}
+                }
+                return moniker;
+            } finally {
+             
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    /* 2009-01-27 hold off on individual-level filtering for now
+    @Override
+    public RoleLevel getHiddenFromDisplayBelowRoleLevel(){
+        if( this.hiddenFromDisplayBelowRoleLevel != null )
+            return this.hiddenFromDisplayBelowRoleLevel;
+        
+        OntModel model = ind.getOntModel(); 
+        model.enterCriticalSection(Lock.READ);
+        try {
+            NodeIterator it = model.listObjectsOfProperty(ind, model.getAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT));
+            if( it == null )
+                return BaseResourceBean.RoleLevel.values()[0];
+            BaseResourceBean.RoleLevel role = BaseResourceBean.RoleLevel.values()[0];            
+            while( it.hasNext() ) {
+                RDFNode node = it.nextNode();
+                if( node != null && node.isURIResource() ) {
+                    BaseResourceBean.RoleLevel foundRole = BaseResourceBean.RoleLevel.getRoleByUri( node.asNode().getURI() );
+                    if( role.compareTo(foundRole ) < 0 ) { // find the lowest of all levels
+                        role = foundRole;
+                    }
+                }
+            }
+            return this.hiddenFromDisplayBelowRoleLevel = role;
+        } finally {
+            model.leaveCriticalSection();
+        }
+    }
+
+    /**
+     * this seems like a mismatch with the RDF storage model.
+     * We could have multiple statements in the model that associated
+     * the individual with multiple or redundant edit display levels.
+     */
+    
+    /*
+    @Override
+    public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
+        if( this.prohibitedFromUpdateBelowRoleLevel != null )
+            return this.prohibitedFromUpdateBelowRoleLevel;
+        
+        OntModel model = ind.getOntModel(); 
+        model.enterCriticalSection(Lock.READ);
+        try {
+            NodeIterator it = model.listObjectsOfProperty(ind, model.getAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT));
+            if( it == null )
+                return BaseResourceBean.RoleLevel.values()[0];
+            BaseResourceBean.RoleLevel role = BaseResourceBean.RoleLevel.values()[0];
+            while( it.hasNext() ){
+                RDFNode node = it.nextNode();
+                if( node != null && node.isURIResource() ) {
+                    BaseResourceBean.RoleLevel foundRole = BaseResourceBean.RoleLevel.getRoleByUri( node.asNode().getURI() );
+                    if( role.compareTo(foundRole ) < 0 ) // find the lowest of all roles
+                        role = foundRole;                    
+                }
+            } 
+            return this.prohibitedFromUpdateBelowRoleLevel = role;            
+        } finally {
+            model.leaveCriticalSection();
+        }                
+    }
+    */
+  
+
+    public String getBlurb() { 
+        if (this.blurb != null) {
+            return blurb;
+        } else {
+            
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                blurb = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().BLURB);
+                return blurb;
+            } finally {
+               
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getDescription() { 
+        if (this.description != null) {
+            return description;
+        } else {
+           
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                description = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().DESCRIPTION);
+                return description;
+            } finally {
+                
+            	ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+
+    public Float getSearchBoost(){ 
+        if( this._searchBoostJena != null ){
+            return this._searchBoostJena;
+        }else{
+            String getPropertyValue = 
+            	"SELECT ?value" +
+            	"WHERE { GRAPH ?g { <" + individualURI + ">" + webappDaoFactory.getJenaBaseDao().SEARCH_BOOST_ANNOT + "?value} }";
+            
+        	dataset.getLock().enterCriticalSection(Lock.READ);
+            try{
+                try {
+                    searchBoost = 
+                        ((Literal)QueryExecutionFactory.create(QueryFactory.create(getPropertyValue), dataset).execSelect()).getFloat();
+                } catch (Exception e) {
+                    searchBoost = null;
+                }                
+                return searchBoost;
+            }finally{
+               
+            	dataset.getLock().leaveCriticalSection();
+            }
+        }
+    }    
+
+	@Override
+	public String getMainImageUri() {  
+		if (this.mainImageUri != NOT_INITIALIZED) {
+			return mainImageUri;
+		} else {
+			for (ObjectPropertyStatement stmt : getObjectPropertyStatements()) {
+				if (stmt.getPropertyURI()
+						.equals(VitroVocabulary.IND_MAIN_IMAGE)) {
+					mainImageUri = stmt.getObjectURI();
+					return mainImageUri;
+				}
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String getImageUrl() { 
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.instanceFromEntityUri(webappDaoFactory, this);
+			log.trace("figured imageInfo for " + getURI() + ": '"
+					+ this.imageInfo + "'");
+		}
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.EMPTY_IMAGE_INFO;
+			log.trace("imageInfo for " + getURI() + " is empty.");
+		}
+		return this.imageInfo.getMainImage().getBytestreamAliasUrl();
+	}
+
+	@Override
+	public String getThumbUrl() { 
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.instanceFromEntityUri(webappDaoFactory, this);
+			log.trace("figured imageInfo for " + getURI() + ": '"
+					+ this.imageInfo + "'");
+		}
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.EMPTY_IMAGE_INFO;
+			log.trace("imageInfo for " + getURI() + " is empty.");
+		}
+		return this.imageInfo.getThumbnail().getBytestreamAliasUrl();
+	}
+
+	public String getAnchor() { 
+        if (this.anchor != null) {
+            return anchor;
+        } else {
+            doUrlAndAnchor();
+            return anchor;
+        }
+    }
+
+    public String getUrl() { 
+        if (this.url != null) {
+            return url;
+        } else {
+            doUrlAndAnchor();
+            return url;
+        }
+    }
+
+    private void doUrlAndAnchor() { 
+      
+    	this.dataset.getLock().enterCriticalSection(Lock.READ);
+    	Model tempModel = ModelFactory.createDefaultModel();
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+        try {
+            if (webappDaoFactory.getJenaBaseDao().PRIMARY_LINK != null) {
+            	String listPropertyValues =
+            		"CONSTRUCT {<" + this.individualURI + "> <" + webappDaoFactory.getJenaBaseDao().PRIMARY_LINK + "> ?values}" +
+            		"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + webappDaoFactory.getJenaBaseDao().PRIMARY_LINK + "> ?values} }";
+            	tempModel = QueryExecutionFactory.create(QueryFactory.create(listPropertyValues), dataset).execConstruct();
+            	ontModel.add(tempModel.listStatements());
+            	OntResource res = ontModel.createOntResource(this.individualURI);
+            	Iterator links = res.listPropertyValues(webappDaoFactory.getJenaBaseDao().PRIMARY_LINK);
+                if (links.hasNext()) {
+                    try {
+                        com.hp.hpl.jena.ontology.Individual linkInd = ((com.hp.hpl.jena.ontology.Individual)((Resource)links.next()).as(com.hp.hpl.jena.ontology.Individual.class));
+                        if (webappDaoFactory.getJenaBaseDao().LINK_ANCHOR != null) {
+                            try {
+                                Literal l = (Literal) linkInd.getPropertyValue(webappDaoFactory.getJenaBaseDao().LINK_ANCHOR);
+                                if (l != null) {
+                                    anchor = l.getString();
+                                }
+                            } catch (ClassCastException e) {}
+                        }
+                        if (webappDaoFactory.getJenaBaseDao().LINK_URL != null) {
+                            try {
+                                Literal l = (Literal) linkInd.getPropertyValue(webappDaoFactory.getJenaBaseDao().LINK_URL);
+                                if (l != null) {
+                                    try {
+                                        url = URLDecoder.decode(l.getString(), "UTF-8");
+                                    } catch (UnsupportedEncodingException use) {}
+                                }
+                            } catch (ClassCastException e) {}
+                        }
+                    } catch (ClassCastException cce) {}
+                }
+            }
+        } finally {
+        	tempModel.close();
+        	ontModel.close();
+        	this.dataset.getLock().leaveCriticalSection();
+        }
+    }
+
+    public List <Link> getLinksList() { 
+        if (this.linksList != null) {
+            return this.linksList;
+        } else {
+            try {
+                webappDaoFactory.getLinksDao().addLinksToIndividual( this );
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not addLinksToIndividual for "+this.getURI());
+            }
+            return this.linksList;
+        }
+    }
+
+    public Link getPrimaryLink() { 
+        if (this.primaryLink != null) {
+            return this.primaryLink;
+        } else {
+            try {
+                webappDaoFactory.getLinksDao().addPrimaryLinkToIndividual( this );
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not addPrimaryLinkToIndividual for "+this.getURI());
+            }
+            return this.primaryLink;
+        }
+    }
+
+
+    public List<String> getKeywords() { 
+        if (this.keywords != null) {
+            return this.keywords;
+        } else {
+            try {
+                this.setKeywords(webappDaoFactory.getIndividualDao().getKeywordsForIndividual(this.getURI()));
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not getKeywords for "+this.getURI());
+            }
+            return this.keywords;
+        }
+    }
+    
+    public List<Keyword> getKeywordObjects() {
+        if (this.keywordObjects != null) { 
+            return this.keywordObjects;
+        } else {
+            try {
+                this.setKeywordObjects(webappDaoFactory.getIndividualDao().getKeywordObjectsForIndividual(this.getURI()));
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not get Keyword Objects for "+this.getURI());
+            }
+        }
+        return this.keywordObjects;
+    }
+
+    public List<ObjectPropertyStatement> getObjectPropertyStatements() { 
+        if (this.objectPropertyStatements != null) {
+            return this.objectPropertyStatements;
+        } else {
+            try {
+                webappDaoFactory.getObjectPropertyStatementDao().fillExistingObjectPropertyStatements(this);
+                //Iterator stmtIt = this.getObjectPropertyStatements().iterator();
+                //while (stmtIt.hasNext()) {
+                //    ObjectPropertyStatement stmt = (ObjectPropertyStatement) stmtIt.next();
+                //    stmt.setObject(webappDaoFactory.getIndividualDao().getIndividualByURI(stmt.getObject().getURI()));
+                //}
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill existing ObjectPropertyStatements for "+this.getURI(), e);
+            }
+            return this.objectPropertyStatements;
+        }
+    }
+    
+    @Override
+    public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyURI) {
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	List<ObjectPropertyStatement> objectPropertyStatements = new ArrayList<ObjectPropertyStatement>();
+    	
+    	dataset.getLock().enterCriticalSection(Lock.READ);
+    	Model tempModel = ModelFactory.createDefaultModel();
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+    	try {
+    		
+    		String valuesOfProperty = 
+    			"CONSTRUCT{<" + this.individualURI + "> <" + propertyURI + "> ?object}" +
+    			"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + propertyURI + "> ?object} }";
+    	    tempModel = QueryExecutionFactory.create(QueryFactory.create(valuesOfProperty), dataset).execConstruct();
+    	    ontModel.add(tempModel.listStatements());
+    	    Resource ontRes = ontModel.getResource(this.individualURI);
+    	    StmtIterator sit = ontRes.listProperties(ontRes.getModel().getProperty(propertyURI));
+    	    while (sit.hasNext()) {
+    			Statement s = sit.nextStatement();
+    			if (!s.getSubject().canAs(OntResource.class) || !s.getObject().canAs(OntResource.class)) {
+    			    continue;	
+    			}
+    			Individual subj = new IndividualSDB(((OntResource) s.getSubject().as(OntResource.class)).getURI(), dataset, webappDaoFactory);
+    			Individual obj = new IndividualSDB(((OntResource) s.getObject().as(OntResource.class)).getURI(), dataset, webappDaoFactory);
+    			ObjectProperty op = webappDaoFactory.getObjectPropertyDao().getObjectPropertyByURI(s.getPredicate().getURI());
+    			if (subj != null && obj != null && op != null) {
+    				ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
+    				ops.setSubject(subj);
+    				ops.setSubjectURI(subj.getURI());
+    				ops.setObject(obj);
+    				ops.setObjectURI(obj.getURI());
+    				ops.setProperty(op);
+    				ops.setPropertyURI(op.getURI());
+    				objectPropertyStatements.add(ops);
+    			}
+    		}
+     	} finally {
+    		tempModel.close();
+    		ontModel.close();
+     		dataset.getLock().leaveCriticalSection();
+    	}
+     	return objectPropertyStatements;
+    }
+
+    @Override
+    public List<Individual> getRelatedIndividuals(String propertyURI) { 
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	List<Individual> relatedIndividuals = new ArrayList<Individual>();
+    	
+    	dataset.getLock().enterCriticalSection(Lock.READ);
+    	Model tempModel = ModelFactory.createDefaultModel();
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+    	try {
+    		String valuesOfProperty = 
+    			"CONSTRUCT{<" + this.individualURI + "> <" + propertyURI + "> ?object}" +
+    			"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + propertyURI + "> ?object} }";
+    		tempModel = QueryExecutionFactory.create(QueryFactory.create(valuesOfProperty), dataset).execConstruct();
+    		ontModel.add(tempModel.listStatements());
+    	    OntResource ontRes = ontModel.createOntResource(this.individualURI);
+    	    NodeIterator values = ontRes.listPropertyValues(ontRes.getModel().getProperty(propertyURI));
+    	    while (values.hasNext()) {
+    	    	RDFNode value = values.nextNode();
+    	    	if (value.canAs(OntResource.class)) {
+        	    	relatedIndividuals.add(
+        	    		new IndividualSDB(((OntResource) value.as(OntResource.class)).getURI(), dataset, webappDaoFactory) );  
+        	    } 
+    	    }
+    	} finally {
+    		tempModel.close();
+    		ontModel.close();
+    		dataset.getLock().leaveCriticalSection();
+    	}
+    	return relatedIndividuals;
+    }
+    
+    @Override
+    public Individual getRelatedIndividual(String propertyURI) { 
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	
+    	dataset.getLock().enterCriticalSection(Lock.READ);
+    	Model tempModel = ModelFactory.createDefaultModel();
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+    	try {
+    		String valueOfProperty = 
+    			"CONSTRUCT{<" + this.individualURI + "> <" + propertyURI + "> ?object}" +
+    			"WHERE{ GRAPH ?g { <" + this.individualURI + "> <" + propertyURI + "> ?object} }";
+    		tempModel = QueryExecutionFactory.create(QueryFactory.create(valueOfProperty), dataset).execConstruct();
+    		ontModel.add(tempModel.listStatements());
+    	    OntResource ontRes = ontModel.createOntResource(this.individualURI);
+    	    RDFNode value = ontRes.getPropertyValue(ontRes.getModel().getProperty(propertyURI));
+    	    if (value != null && value.canAs(OntResource.class)) {
+    	    	return new IndividualSDB(((OntResource) value.as(OntResource.class)).getURI(), dataset, webappDaoFactory);  
+    	    } else {
+    	    	return null;
+    	    }
+    	} finally {
+    		tempModel.close();
+    		ontModel.close();
+    		dataset.getLock().leaveCriticalSection();
+    	}
+    }
+    
+    public List<ObjectProperty> getObjectPropertyList() { 
+        if (this.propertyList != null) {
+            return this.propertyList;
+        } else {
+            try {
+                webappDaoFactory.getObjectPropertyDao().fillObjectPropertiesForIndividual( this );
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fillEntityProperties for "+this.getURI());
+            }
+            return this.propertyList;
+        }
+    }
+    
+    @Override
+    public Map<String,ObjectProperty> getObjectPropertyMap() { 
+    	if (this.objectPropertyMap != null) {
+    		return objectPropertyMap;
+    	} else {
+    		Map map = new HashMap<String,ObjectProperty>();
+    		if (this.propertyList == null) {
+    			getObjectPropertyList();
+    		}
+    		for (Iterator i = this.propertyList.iterator(); i.hasNext();) { 
+    			ObjectProperty op = (ObjectProperty) i.next();
+    			if (op.getURI() != null) {
+    				map.put(op.getURI(), op);
+    			}
+    		}
+    		this.objectPropertyMap = map;
+    		return map;    		
+    	}
+    }
+
+    public List<DataPropertyStatement> getDataPropertyStatements() { 
+        if (this.dataPropertyStatements != null) {
+            return this.dataPropertyStatements;
+        } else {
+            try {
+                webappDaoFactory.getDataPropertyStatementDao().fillExistingDataPropertyStatementsForIndividual(this/*,false*/);
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill existing DataPropertyStatements for "+this.getURI());
+            }
+            return this.dataPropertyStatements;
+        }
+    }
+
+    public List getDataPropertyList() {
+        if (this.datatypePropertyList != null) { 
+            return this.datatypePropertyList;
+        } else {
+            try {
+                webappDaoFactory.getDataPropertyDao().fillDataPropertiesForIndividual( this );
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill data properties for "+this.getURI());
+            }
+            return this.datatypePropertyList;
+        }
+    }
+    
+    @Override
+    public Map<String,DataProperty> getDataPropertyMap() { 
+    	if (this.dataPropertyMap != null) {
+    		return dataPropertyMap;
+    	} else {
+    		Map map = new HashMap<String,DataProperty>();
+    		if (this.datatypePropertyList == null) {
+    			getDataPropertyList();
+    		}
+    		for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { 
+    			DataProperty dp = (DataProperty) i.next();
+    			if (dp.getURI() != null) {
+    				map.put(dp.getURI(), dp);
+    			}
+    		}
+    		this.dataPropertyMap = map;
+    		return map;    		
+    	}
+    }
+
+    public List<DataPropertyStatement> getExternalIds() { 
+        // BJL 2007-11-11: need to decide whether we want to use Collections or Lists in our interfaces - we seem to be leaning toward Lists
+        if (this.externalIds != null) {
+            return this.externalIds;
+        } else {
+            try {
+                List<DataPropertyStatement> dpsList = new ArrayList<DataPropertyStatement>();
+                dpsList.addAll(webappDaoFactory.getIndividualDao().getExternalIds(this.getURI(), null));
+                this.externalIds = dpsList;
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill external IDs for "+this.getURI());
+            }
+            return this.externalIds;
+        }
+    }
+    
+    @Override
+    public List<VClass> getVClasses() { 
+    	return getVClasses(false);
+    }
+    
+    @Override
+    public List<VClass> getVClasses(boolean direct) {
+    	if (direct) {
+    		if (directVClasses != null) {
+    			return directVClasses;
+    		} else {
+    			directVClasses = getMyVClasses(true);
+    			return directVClasses;
+    		}
+    	} else {
+    		if (allVClasses != null) {
+    			return allVClasses;
+    		} else {
+    			allVClasses = getMyVClasses(false);
+    			return allVClasses;
+    		}
+    	}
+    }
+    
+    private List<VClass> getMyVClasses(boolean direct) {
+        long mstart = System.currentTimeMillis();
+		List<VClass> vClassList = new ArrayList<VClass>(); 
+		//this.dataset.getLock().enterCriticalSection(Lock.READ);
+		//Model tempModel = ModelFactory.createDefaultModel();
+		Model tempModel = ind.getModel();
+		//try {
+			//String getTypes = 
+        	//	"CONSTRUCT{ <" + this.individualURI + "> <" + RDF.type + "> ?types }\n" +
+        	//	"WHERE{ GRAPH " + ((true) ? "<http://vitro.mannlib.cornell.edu/default/vitro-kb-2>" : "?g") 
+        	//	+ " { <" + this.individualURI +"> <" +RDF.type+ "> ?types \n" +
+        	//			"} } \n";
+        	//long startTime = System.currentTimeMillis();
+        	//tempModel = QueryExecutionFactory.create(QueryFactory.create(getTypes), dataset).execConstruct();
+        	//System.out.println((System.currentTimeMillis() - startTime));
+        	StmtIterator stmtItr = tempModel.listStatements((Resource) null, RDF.type, (RDFNode) null);
+        	LinkedList<String> list = new LinkedList<String>();
+        	while(stmtItr.hasNext()){
+        		Statement stmt = stmtItr.nextStatement();
+        		if (stmt.getObject().isResource() && !stmt.getObject().isAnon()) {
+        			list.add(((Resource) stmt.getObject()).getURI());
+        		}
+        	}
+        	Iterator<String> itr = null;
+        	VClassDao checkSubClass = this.webappDaoFactory.getVClassDao();
+        	boolean directTypes = false;
+        	String currentType = null;
+    	    ArrayList<String> done = new ArrayList<String>();
+    	    
+    	    /* Loop for comparing starts here */
+    	    if(direct){
+        	while(!directTypes){
+        		 itr = list.listIterator();
+        		 
+        		do{
+        			if(itr.hasNext()){
+        		 currentType = itr.next();}
+        			else{
+        				directTypes = true; // get next element for comparison
+        			 break;}
+        		}while(done.contains(currentType));
+        		
+        		if(directTypes)
+        			break;                 // check to see if its all over otherwise start comparing
+        		else
+        	    itr = list.listIterator();	
+        		
+        	while(itr.hasNext()){
+        		String nextType = itr.next();
+        	    if(checkSubClass.isSubClassOf(currentType, nextType) && !currentType.equalsIgnoreCase(nextType)){
+        	    	//System.out.println(currentType + " is subClassOf " + nextType);
+        	    	itr.remove();
+        	    }
+        	}
+        	
+        	done.add(currentType);  // add the uri to done list. 
+        	}
+    	    }
+        	
+        	/* Loop for comparing ends here */
+    	    Iterator<String> typeIt = list.iterator();
+			try {
+				for (Iterator it = typeIt; it.hasNext();) {
+					Resource type = ResourceFactory.createResource(it.next().toString());
+					String typeURI = (!type.isAnon()) ? type.getURI() : VitroVocabulary.PSEUDO_BNODE_NS + type.getId().toString();
+					if (type.getNameSpace() == null || (!webappDaoFactory.getNonuserNamespaces().contains(type.getNameSpace())) ) {
+						VClass vc = webappDaoFactory.getVClassDao().getVClassByURI(type.getURI());
+						if (vc != null) {
+							vClassList.add(vc);
+						}
+					}
+					
+				}
+			} finally {
+				//typeIt.close();
+			}
+		//} finally {
+		//	tempModel.close();
+		//	this.dataset.getLock().leaveCriticalSection();
+		//}
+		try {
+			Collections.sort(vClassList);
+		} catch (Exception e) {}
+		
+		//System.out.println("Overall: " + (System.currentTimeMillis() - mstart));
+		return vClassList;
+	}
+    
+	/**
+	 * The base method in {@link IndividualImpl} is adequate if the reasoner is
+	 * up to date. 
+	 * 
+	 * If the base method returns false, check directly to see if
+	 * any of the super classes of the direct classes will satisfy this request.
+	 */
+	@Override
+	public boolean isVClass(String uri) { 
+    	if (uri == null) {
+    		return false;
+    	}
+
+		if (super.isVClass(uri)) {
+			return true;
+		}
+
+		VClassDao vclassDao = webappDaoFactory.getVClassDao();
+		for (VClass vClass : getVClasses(true)) {
+			for (String superClassUri: vclassDao.getAllSuperClassURIs(vClass.getURI())) {
+				if (uri.equals(superClassUri)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean isMemberOfClassProhibitedFromSearch(ProhibitedFromSearch pfs) {  
+		this.dataset.getLock().enterCriticalSection(Lock.READ);
+		Model tempModel = ModelFactory.createDefaultModel();
+		OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+		try {
+			String getTypes = 
+	    		"CONSTRUCT{ <" + this.individualURI + "> <" + RDF.type + "> ?types }\n" +
+	    		"WHERE{ GRAPH ?g { <" + this.individualURI +"> <" +RDF.type+ "> ?types \n" +
+	    				"} } \n";
+			tempModel = QueryExecutionFactory.create(QueryFactory.create(getTypes), dataset).execConstruct();
+    		ontModel.add(tempModel.listStatements());
+    	    OntResource ontRes = ontModel.createOntResource(this.individualURI);
+    	    StmtIterator stmtIt = ontRes.listProperties(RDF.type);
+    	    try {
+				while(stmtIt.hasNext()) {
+					Statement stmt = stmtIt.nextStatement();
+					if (stmt.getObject().isURIResource()) {
+						String typeURI = ((Resource)stmt.getObject()).getURI();
+						if (pfs.isClassProhibited(typeURI)) {
+							return false;
+						}
+					}
+				}
+			} finally {
+				stmtIt.close();
+			}
+			return false;
+		} finally {
+			tempModel.close();
+			ontModel.close();
+			this.dataset.getLock().leaveCriticalSection();
+		}
+	}
+
+    /**
+     * Overriding the base method so that we can do the sorting by arbitrary property here.  An
+     * IndividualSDB has a reference back to the model; everything else is just a dumb bean (for now).
+     */
+    @Override
+    protected void sortEnts2EntsForDisplay(){ 
+        if( getObjectPropertyList() == null ) return;
+
+        Iterator it = getObjectPropertyList().iterator();
+        while(it.hasNext()){
+            ObjectProperty prop = (ObjectProperty)it.next();
+        /*  if (prop.getObjectIndividualSortPropertyURI()==null) {
+            	prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+            } else {*/
+            	prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+        /*  }*/
+        }
+    }
+    
+    private Collator collator = Collator.getInstance();
+    
+    private void sortObjectPropertyStatementsForDisplay(ObjectProperty prop) { 
+    	try {
+    		log.info("Doing special sort for "+prop.getDomainPublic());
+    		final String sortPropertyURI = prop.getObjectIndividualSortPropertyURI();
+            String tmpDir;
+            boolean tmpAsc;
+
+            tmpDir = prop.getDomainEntitySortDirection();
+
+            //valid values are "desc" and "asc", anything else will default to ascending
+            tmpAsc = !"desc".equalsIgnoreCase(tmpDir);
+
+            final boolean dir = tmpAsc;
+            Comparator comp = new Comparator(){
+                final boolean cAsc = dir;
+
+                public final int compare(Object o1, Object o2){
+                    ObjectPropertyStatement e2e1= (ObjectPropertyStatement)o1, e2e2=(ObjectPropertyStatement)o2;
+                    Individual e1 , e2;
+                    e1 = e2e1 != null ? e2e1.getObject():null;
+                    e2 = e2e2 != null ? e2e2.getObject():null;
+
+                    Object val1 = null, val2 = null;
+                    if( e1 != null ){
+                        try {
+                        	DataProperty dp = e1.getDataPropertyMap().get(sortPropertyURI);
+                        	if (dp.getDataPropertyStatements() != null && dp.getDataPropertyStatements().size()>0) {
+                        		val1 = dp.getDataPropertyStatements().get(0).getData();
+                        	}
+                        }
+                        catch (Exception e) {
+                        	val1 = "";
+                        }
+                    } else {
+                        log.warn( "IndividualSDB.sortObjectPropertiesForDisplay passed object property statement with no range entity.");
+                    }
+
+                    if( e2 != null ){
+                        try {
+                        	DataProperty dp = e2.getDataPropertyMap().get(sortPropertyURI);
+                        	if (dp.getDataPropertyStatements() != null && dp.getDataPropertyStatements().size()>0) {
+                        		val2 = dp.getDataPropertyStatements().get(0).getData();
+                        	}
+                        }
+                        catch (Exception e) {
+                        	val2 = "";
+                        }
+                    } else {
+                        log.warn( "IndividualSDB.sortObjectPropertyStatementsForDisplay() was passed an object property statement with no range entity.");
+                    }
+
+                    int rv = 0;
+                    try {
+                        if( val1 instanceof String )
+                        	rv = collator.compare( ((String)val1) , ((String)val2) );
+                            //rv = ((String)val1).compareTo((String)val2);
+                        else if( val1 instanceof Date ) {
+                            DateTime dt1 = new DateTime((Date)val1);
+                            DateTime dt2 = new DateTime((Date)val2);
+                            rv = dt1.compareTo(dt2);
+                        }
+                        else
+                            rv = 0;
+                    } catch (NullPointerException e) {
+                        e.printStackTrace();
+                    }
+
+                    if( cAsc )
+                        return rv;
+                    else
+                        return rv * -1;
+                }
+            };
+            try {
+                Collections.sort(getObjectPropertyStatements(), comp);
+            } catch (Exception e) {
+                log.error("Exception sorting object property statements for object property "+this.getURI());
+            }
+
+    		
+    	} catch (Exception e) {
+    		log.error(e);
+    	}
+    }
+    
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB2.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB2.java
new file mode 100644
index 000000000..31b4de176
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB2.java
@@ -0,0 +1,1167 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.sql.Timestamp;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.ontology.OntResource;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.NodeIterator;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.Keyword;
+import edu.cornell.mannlib.vitro.webapp.beans.Link;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
+import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
+import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
+
+public class IndividualSDB2 extends IndividualImpl implements Individual {
+
+    private static final Log log = LogFactory.getLog(IndividualJena.class.getName());
+    private OntResource ind = null;
+    private WebappDaoFactoryJena webappDaoFactory = null;
+    private Float _searchBoostJena = null;
+    private boolean retreivedNullRdfsLabel = false;
+    private Dataset dataset = null;
+    private Model model = null;
+    
+    public IndividualSDB2(String individualURI, Dataset dataset, WebappDaoFactoryJena wadf) {
+    	this.dataset = dataset;
+    	this.dataset.getLock().enterCriticalSection(Lock.READ);
+    	String getStatements = 
+    		"CONSTRUCT " +
+    		"{ <"+individualURI+">  ?p ?o . \n" +
+    		   "?s ?pp <"+individualURI+"> . } \n" +
+    		 "WHERE { GRAPH ?g { \n" +
+    		 "  {<"+individualURI+">  ?p ?o . } UNION { \n" +
+    		 "  ?s ?pp <"+individualURI+"> . } \n" +
+    		 "} } \n";
+    	
+    	model = QueryExecutionFactory.create(QueryFactory.create(getStatements), dataset).execConstruct();
+    	
+    	this.dataset.getLock().leaveCriticalSection();
+    	
+    	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, model);
+    	
+    	this.ind = ontModel.getOntResource(individualURI);
+    	if (ind != null) {
+	        if (ind.isAnon()) {
+	        	
+	        	this.setNamespace(VitroVocabulary.PSEUDO_BNODE_NS);
+	        	this.setLocalName(ind.getId().toString());
+	        } else {
+	        
+	        	this.URI = ind.getURI();
+	        	this.namespace = ind.getNameSpace();
+	        	this.localName = ind.getLocalName();
+	        }
+    	} else if (individualURI != null) {
+    		log.warn("Null individual returned for URI " + individualURI);
+    		this.ind = ontModel.createOntResource(individualURI);
+    	}
+        
+        this.webappDaoFactory = wadf;
+    }
+
+    public String getName() { //checked
+        if (this.name != null) {
+            return name;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+            	if (webappDaoFactory == null) {
+            		throw new RuntimeException ("null webappDaoFactory");
+            	} else if (webappDaoFactory.getJenaBaseDao() == null) {
+            		throw new RuntimeException ("null JenaBaseDao");
+            	}
+                this.name = webappDaoFactory.getJenaBaseDao().getLabelOrId(ind);
+                if (this.name == null) {
+                    this.name = "[null]";
+                }
+                return this.name;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getRdfsLabel() { //checked.
+        if (this.rdfsLabel != null) {
+            return rdfsLabel;
+        } else if( this.rdfsLabel == null && retreivedNullRdfsLabel ){
+        	return null;
+        } else { 
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                this.rdfsLabel = webappDaoFactory.getJenaBaseDao().getLabel(ind);
+                retreivedNullRdfsLabel = this.rdfsLabel == null;
+                return this.rdfsLabel;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+    
+    public String getVClassURI() { //done
+        if (this.vClassURI != null) {
+            return vClassURI;
+        } else {
+        	ind.getOntModel().enterCriticalSection(Lock.READ);
+        	try {
+        		
+                ClosableIterator typeIt = ind.listRDFTypes(false);
+                LinkedList<String> list = new LinkedList<String>();
+                Resource type = null;
+                while(typeIt.hasNext()){
+                	type = (Resource) typeIt.next();
+            		list.add(type.getURI());
+            	}
+                typeIt.close();
+                
+                Iterator<String> itr = null;
+            	VClassDaoJena checkSubClass = new VClassDaoJena(this.webappDaoFactory);
+            	boolean directTypes = false;
+            	String currentType = null;
+        	    ArrayList<String> done = new ArrayList<String>();
+        	    
+        	    /* Loop for comparing starts here */
+        	    
+            	while(!directTypes){
+            		 itr = list.listIterator();
+            		 
+            		do{
+            			if(itr.hasNext()){
+            		 currentType = itr.next();}
+            			else{
+            				directTypes = true; // get next element for comparison
+            			 break;}
+            		}while(done.contains(currentType));
+            		
+            		if(directTypes)
+            			break;                 // check to see if its all over otherwise start comparing
+            		else
+            	    itr = list.listIterator();	
+            		
+            	while(itr.hasNext()){
+            		String nextType = itr.next();
+            	    if(checkSubClass.isSubClassOf(currentType, nextType) && !currentType.equalsIgnoreCase(nextType)){
+            	    	//System.out.println(currentType + " is subClassOf " + nextType);
+            	    	itr.remove();
+            	    }
+            	}
+            	
+            	done.add(currentType);  // add the uri to done list. 
+            	}
+            	
+            	/* Loop for comparing ends here */
+                
+               Iterator<String> typeItr = list.listIterator();
+                try {
+	                while (typeItr.hasNext()) {
+	                    type = ResourceFactory.createResource(typeItr.next());
+	                    if (type.getNameSpace()!=null && (!webappDaoFactory.getJenaBaseDao().NONUSER_NAMESPACES.contains(type.getNameSpace()) || type.getURI().equals(OWL.Thing.getURI())) ) {
+	                    	this.vClassURI=type.getURI();
+	                        break;
+	                    }
+	                }
+                } finally {
+                	//typeIt.close();
+                }
+        	} finally {
+        		ind.getOntModel().leaveCriticalSection();
+        	}
+        	return this.vClassURI;
+        }
+    }
+
+    public VClass getVClass() { //done
+        if (this.vClass != null) {
+            return this.vClass;
+        } else {
+        	 ind.getOntModel().enterCriticalSection(Lock.READ);
+             try {
+                 ClosableIterator typeIt = ind.listRDFTypes(false);
+                 
+                 LinkedList<String> list = new LinkedList<String>();
+                 Resource type = null;
+                 while(typeIt.hasNext()){
+                 	type = (Resource) typeIt.next();
+             		list.add(type.getURI());
+             	}
+                 typeIt.close();
+                 
+                 Iterator<String> itr = null;
+             	VClassDaoJena checkSubClass = new VClassDaoJena(this.webappDaoFactory);
+             	boolean directTypes = false;
+             	String currentType = null;
+         	    ArrayList<String> done = new ArrayList<String>();
+         	    
+         	    /* Loop for comparing starts here */
+         	    
+             	while(!directTypes){
+             		 itr = list.listIterator();
+             		 
+             		do{
+             			if(itr.hasNext()){
+             		 currentType = itr.next();}
+             			else{
+             				directTypes = true; // get next element for comparison
+             			 break;}
+             		}while(done.contains(currentType));
+             		
+             		if(directTypes)
+             			break;                 // check to see if its all over otherwise start comparing
+             		else
+             	    itr = list.listIterator();	
+             		
+             	while(itr.hasNext()){
+             		String nextType = itr.next();
+             	    if(checkSubClass.isSubClassOf(currentType, nextType) && !currentType.equalsIgnoreCase(nextType)){
+             	    	//System.out.println(currentType + " is subClassOf " + nextType);
+             	    	itr.remove();
+             	    }
+             	}
+             	
+             	done.add(currentType);  // add the uri to done list. 
+             	}
+             	
+             	/* Loop for comparing ends here */
+                 
+                Iterator<String> typeItr = list.listIterator();
+                 try {
+ 	                while (typeItr.hasNext()) {
+ 	                    type = ResourceFactory.createResource(typeItr.next());
+ 	                    if (type.getNameSpace()!=null && (!webappDaoFactory.getJenaBaseDao().NONUSER_NAMESPACES.contains(type.getNameSpace()) || type.getURI().equals(OWL.Thing.getURI())) ) {
+ 	                    	this.vClassURI=type.getURI();
+ 	                        this.vClass = webappDaoFactory.getVClassDao().getVClassByURI(this.vClassURI);
+ 	                        break;
+ 	                    }
+ 	                }
+                 } finally {
+                 	//typeIt.close();
+                 }
+                 return this.vClass;
+             } finally {
+                 ind.getOntModel().leaveCriticalSection();
+             }
+        }
+    }
+
+    public int getFlag1Numeric() {
+        if (flag1Numeric > -1) {
+            return flag1Numeric;
+        } else {
+            doFlag1();
+            return flag1Numeric;
+        }
+    }
+
+    public String getFlag1Set() {
+        if (flag1Set != null) {
+            return flag1Set;
+        } else {
+            doFlag1();
+            return flag1Set;
+        }
+    }
+
+    public String getFlag2Set() {
+        if (flag2Set != null) {
+            return flag2Set;
+        } else {
+            doFlag2();
+            return flag2Set;
+        }
+    }
+
+    /* Consider the flagBitMask as a mask to & with flags.
+   if flagBitMask bit zero is set then return true if
+   the individual is in portal 2,
+   if flagBitMask bit 1 is set then return true if
+   the individua is in portal 4
+   etc.
+   Portal uris look like this:
+   "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Flag1Value1Thing"
+    */
+    public boolean doesFlag1Match(int flagBitMask) { 
+        Long [] numerics = FlagMathUtils.numeric2numerics(flagBitMask);
+        ind.getOntModel().enterCriticalSection(Lock.READ);
+        try{
+            for( Long numericPortal : numerics){
+                int portalid = FlagMathUtils.numeric2Portalid(numericPortal);
+                String portalTypeUri = VitroVocabulary.vitroURI + "Flag1Value" + portalid + "Thing";
+                Resource portalType = ResourceFactory.createResource(portalTypeUri);
+                if( ! ind.getOntModel().contains(ind,RDF.type,portalType))
+                    return false;
+            }
+        }finally{
+            ind.getOntModel().leaveCriticalSection();
+        }
+        return true;
+    }
+
+    private void doFlag1() { 
+        ind.getOntModel().enterCriticalSection(Lock.READ);
+
+        try {
+            ClosableIterator typeIt=null;
+            int portalNumeric = 0;
+            String portalSet = "";
+            try{
+                typeIt = ind.getOntModel().listStatements(ind, RDF.type ,(String) null);
+
+                while (typeIt.hasNext()) {
+                    Statement stmt = (Statement) typeIt.next();
+                    Resource type = (Resource)stmt.getObject();
+                    String typeName = type.getLocalName();
+                    if(type.getNameSpace() != null && type.getNameSpace().equals(VitroVocabulary.vitroURI) && typeName.indexOf("Flag1Value")==0) {
+                        try {
+                            int portalNumber = Integer.decode(typeName.substring(10,typeName.length()-5));
+                            portalNumeric = portalNumeric | (1 << portalNumber);
+                            if (portalSet.length() > 0) {
+                                portalSet+=",";
+                            }
+                            portalSet+=Integer.toString(portalNumber);
+                        } catch (Exception e) {}
+                    }
+                }
+            }finally{
+                if( typeIt != null ) typeIt.close() ;
+            }
+            flag1Set = portalSet;
+            flag1Numeric = portalNumeric;
+        } finally {
+            ind.getOntModel().leaveCriticalSection();
+        }
+    }
+
+    private void doFlag2() {
+        ind.getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            ClosableIterator typeIt=null;
+            String flagSet = "";
+            try{
+                typeIt = ind.getOntModel().listStatements(ind, RDF.type ,(String) null);
+                while (typeIt.hasNext()) {
+                    Statement stmt = (Statement) typeIt.next();
+                    Resource type = (Resource)stmt.getObject();
+                    String typeName = type.getLocalName();
+                    if(type.getNameSpace() != null && type.getNameSpace().equals(VitroVocabulary.vitroURI) && typeName.indexOf("Flag2Value")==0) {
+                        try {
+                            String flagValue = ((WebappDaoFactoryJena)webappDaoFactory).getFlag2ClassLabelMap().get(type);
+                            if (flagSet.length() > 0) {
+                                flagSet+=",";
+                            }
+                            flagSet+=flagValue;
+                        } catch (Exception e) {}
+                    }
+                }
+            }finally{
+                if( typeIt != null ) typeIt.close() ;
+            }
+            flag2Set = flagSet;
+        } finally {
+            ind.getOntModel().leaveCriticalSection();
+        }
+    }
+
+
+    public Date getSunrise() {
+        if (sunrise != null) {
+            return sunrise;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                sunrise = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().SUNRISE);
+                return sunrise;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Date getSunset() {
+        if (sunset != null) {
+            return sunset;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                sunset = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().SUNSET);
+                return sunset;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Date getTimekey() {
+        if (timekey != null) {
+            return timekey;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                timekey = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().TIMEKEY);
+                return timekey;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public Timestamp getModTime() {
+        if (modTime != null) {
+            return modTime;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                Date modDate = webappDaoFactory.getJenaBaseDao().getPropertyDateTimeValue(ind,webappDaoFactory.getJenaBaseDao().MODTIME);
+                if (modDate != null) {
+                    modTime = new Timestamp(modDate.getTime());
+                }
+                return modTime;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getMoniker() {
+        if (moniker != null) {
+            return moniker;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                moniker = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().MONIKER);
+                if (moniker == null) {
+                	try {
+                        // trying to deal with the fact that an entity may have more than 1 VClass
+                        List<VClass> clasList = this.getVClasses(true);
+                        if (clasList == null || clasList.size() < 2) {
+                            moniker = getVClass().getName();
+                        } else {
+                            VClass preferredClass = null;
+                            for (VClass clas : clasList) {
+                                if (clas.getCustomDisplayView() != null && clas.getCustomDisplayView().length()>0) {
+                                    // arbitrarily deciding that the preferred class (could be >1) is one with a custom view
+                                    preferredClass = clas;
+                                    log.debug("Found direct class ["+clas.getName()+"] with custom view "+clas.getCustomDisplayView()+"; resetting entity vClass to this class");
+                                }
+                            }
+                            if (preferredClass == null) {
+                                // no basis for selecting a preferred class name to use
+                                moniker = null; // was this.getVClass().getName();
+                            } else {
+                                moniker = preferredClass.getName();
+                            }
+                        }
+                	} catch (Exception e) {}
+                }
+                return moniker;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    /* 2009-01-27 hold off on individual-level filtering for now
+    @Override
+    public RoleLevel getHiddenFromDisplayBelowRoleLevel(){
+        if( this.hiddenFromDisplayBelowRoleLevel != null )
+            return this.hiddenFromDisplayBelowRoleLevel;
+        
+        OntModel model = ind.getOntModel(); 
+        model.enterCriticalSection(Lock.READ);
+        try {
+            NodeIterator it = model.listObjectsOfProperty(ind, model.getAnnotationProperty(VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT));
+            if( it == null )
+                return BaseResourceBean.RoleLevel.values()[0];
+            BaseResourceBean.RoleLevel role = BaseResourceBean.RoleLevel.values()[0];            
+            while( it.hasNext() ) {
+                RDFNode node = it.nextNode();
+                if( node != null && node.isURIResource() ) {
+                    BaseResourceBean.RoleLevel foundRole = BaseResourceBean.RoleLevel.getRoleByUri( node.asNode().getURI() );
+                    if( role.compareTo(foundRole ) < 0 ) { // find the lowest of all levels
+                        role = foundRole;
+                    }
+                }
+            }
+            return this.hiddenFromDisplayBelowRoleLevel = role;
+        } finally {
+            model.leaveCriticalSection();
+        }
+    }
+
+    /**
+     * this seems like a mismatch with the RDF storage model.
+     * We could have multiple statements in the model that associated
+     * the individual with multiple or redundant edit display levels.
+     */
+    
+    /*
+    @Override
+    public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
+        if( this.prohibitedFromUpdateBelowRoleLevel != null )
+            return this.prohibitedFromUpdateBelowRoleLevel;
+        
+        OntModel model = ind.getOntModel(); 
+        model.enterCriticalSection(Lock.READ);
+        try {
+            NodeIterator it = model.listObjectsOfProperty(ind, model.getAnnotationProperty(VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT));
+            if( it == null )
+                return BaseResourceBean.RoleLevel.values()[0];
+            BaseResourceBean.RoleLevel role = BaseResourceBean.RoleLevel.values()[0];
+            while( it.hasNext() ){
+                RDFNode node = it.nextNode();
+                if( node != null && node.isURIResource() ) {
+                    BaseResourceBean.RoleLevel foundRole = BaseResourceBean.RoleLevel.getRoleByUri( node.asNode().getURI() );
+                    if( role.compareTo(foundRole ) < 0 ) // find the lowest of all roles
+                        role = foundRole;                    
+                }
+            } 
+            return this.prohibitedFromUpdateBelowRoleLevel = role;            
+        } finally {
+            model.leaveCriticalSection();
+        }                
+    }
+    */
+  
+
+    public String getBlurb() {
+        if (this.blurb != null) {
+            return blurb;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                blurb = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().BLURB);
+                return blurb;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+    public String getDescription() {
+        if (this.description != null) {
+            return description;
+        } else {
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try {
+                description = webappDaoFactory.getJenaBaseDao().getPropertyStringValue(ind,webappDaoFactory.getJenaBaseDao().DESCRIPTION);
+                return description;
+            } finally {
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }
+
+
+    public Float getSearchBoost(){
+        if( this._searchBoostJena != null ){
+            return this._searchBoostJena;
+        }else{
+            ind.getOntModel().enterCriticalSection(Lock.READ);
+            try{
+                try {
+                    searchBoost = 
+                        ((Literal)ind.getPropertyValue(webappDaoFactory.getJenaBaseDao().SEARCH_BOOST_ANNOT)).getFloat();
+                } catch (Exception e) {
+                    searchBoost = null;
+                }                
+                return searchBoost;
+            }finally{
+                ind.getOntModel().leaveCriticalSection();
+            }
+        }
+    }    
+
+	@Override
+	public String getMainImageUri() {
+		if (this.mainImageUri != NOT_INITIALIZED) {
+			return mainImageUri;
+		} else {
+			for (ObjectPropertyStatement stmt : getObjectPropertyStatements()) {
+				if (stmt.getPropertyURI()
+						.equals(VitroVocabulary.IND_MAIN_IMAGE)) {
+					mainImageUri = stmt.getObjectURI();
+					return mainImageUri;
+				}
+			}
+			return null;
+		}
+	}
+
+	@Override
+	public String getImageUrl() {
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.instanceFromEntityUri(webappDaoFactory, this);
+			log.trace("figured imageInfo for " + getURI() + ": '"
+					+ this.imageInfo + "'");
+		}
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.EMPTY_IMAGE_INFO;
+			log.trace("imageInfo for " + getURI() + " is empty.");
+		}
+		return this.imageInfo.getMainImage().getBytestreamAliasUrl();
+	}
+
+	@Override
+	public String getThumbUrl() {
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.instanceFromEntityUri(webappDaoFactory, this);
+			log.trace("figured imageInfo for " + getURI() + ": '"
+					+ this.imageInfo + "'");
+		}
+		if (this.imageInfo == null) {
+			this.imageInfo = ImageInfo.EMPTY_IMAGE_INFO;
+			log.trace("imageInfo for " + getURI() + " is empty.");
+		}
+		return this.imageInfo.getThumbnail().getBytestreamAliasUrl();
+	}
+
+	public String getAnchor() {
+        if (this.anchor != null) {
+            return anchor;
+        } else {
+            doUrlAndAnchor();
+            return anchor;
+        }
+    }
+
+    public String getUrl() {
+        if (this.url != null) {
+            return url;
+        } else {
+            doUrlAndAnchor();
+            return url;
+        }
+    }
+
+    private void doUrlAndAnchor() {
+        ind.getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            if (webappDaoFactory.getJenaBaseDao().PRIMARY_LINK != null) {
+                Iterator links = ind.listPropertyValues(webappDaoFactory.getJenaBaseDao().PRIMARY_LINK);
+                if (links.hasNext()) {
+                    try {
+                        com.hp.hpl.jena.ontology.Individual linkInd = ((com.hp.hpl.jena.ontology.Individual)((Resource) links.next()).as(com.hp.hpl.jena.ontology.Individual.class));
+                        if (webappDaoFactory.getJenaBaseDao().LINK_ANCHOR != null) {
+                            try {
+                                Literal l = (Literal) linkInd.getPropertyValue(webappDaoFactory.getJenaBaseDao().LINK_ANCHOR);
+                                if (l != null) {
+                                    anchor = l.getString();
+                                }
+                            } catch (ClassCastException e) {}
+                        }
+                        if (webappDaoFactory.getJenaBaseDao().LINK_URL != null) {
+                            try {
+                                Literal l = (Literal) linkInd.getPropertyValue(webappDaoFactory.getJenaBaseDao().LINK_URL);
+                                if (l != null) {
+                                    try {
+                                        url = URLDecoder.decode(l.getString(), "UTF-8");
+                                    } catch (UnsupportedEncodingException use) {}
+                                }
+                            } catch (ClassCastException e) {}
+                        }
+                    } catch (ClassCastException cce) {}
+                }
+            }
+        } finally {
+            ind.getOntModel().leaveCriticalSection();
+        }
+    }
+
+    public List <Link> getLinksList() {
+        if (this.linksList != null) {
+            return this.linksList;
+        } else {
+            try {
+                webappDaoFactory.getLinksDao().addLinksToIndividual( this );
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not addLinksToIndividual for "+this.getURI());
+            }
+            return this.linksList;
+        }
+    }
+
+    public Link getPrimaryLink() {
+        if (this.primaryLink != null) {
+            return this.primaryLink;
+        } else {
+            try {
+                webappDaoFactory.getLinksDao().addPrimaryLinkToIndividual( this );
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not addPrimaryLinkToIndividual for "+this.getURI());
+            }
+            return this.primaryLink;
+        }
+    }
+
+
+    public List<String> getKeywords() {
+        if (this.keywords != null) {
+            return this.keywords;
+        } else {
+            try {
+                this.setKeywords(webappDaoFactory.getIndividualDao().getKeywordsForIndividual(this.getURI()));
+            } catch (Exception e) {
+                log.debug(this.getClass().getName()+" could not getKeywords for "+this.getURI());
+            }
+            return this.keywords;
+        }
+    }
+    
+    public List<Keyword> getKeywordObjects() {
+        if (this.keywordObjects != null) {
+            return this.keywordObjects;
+        } else {
+            try {
+                this.setKeywordObjects(webappDaoFactory.getIndividualDao().getKeywordObjectsForIndividual(this.getURI()));
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not get Keyword Objects for "+this.getURI());
+            }
+        }
+        return this.keywordObjects;
+    }
+
+    public List<ObjectPropertyStatement> getObjectPropertyStatements() {
+        if (this.objectPropertyStatements != null) {
+            return this.objectPropertyStatements;
+        } else {
+            try {
+                webappDaoFactory.getObjectPropertyStatementDao().fillExistingObjectPropertyStatements(this);
+                //Iterator stmtIt = this.getObjectPropertyStatements().iterator();
+                //while (stmtIt.hasNext()) {
+                //    ObjectPropertyStatement stmt = (ObjectPropertyStatement) stmtIt.next();
+                //    stmt.setObject(webappDaoFactory.getIndividualDao().getIndividualByURI(stmt.getObject().getURI()));
+                //}
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill existing ObjectPropertyStatements for "+this.getURI(), e);
+            }
+            return this.objectPropertyStatements;
+        }
+    }
+    
+    @Override
+    public List<ObjectPropertyStatement> getObjectPropertyStatements(String propertyURI) {
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	List<ObjectPropertyStatement> objectPropertyStatements = new ArrayList<ObjectPropertyStatement>();
+    	ind.getOntModel().enterCriticalSection(Lock.READ);
+    	try {
+    		StmtIterator sit = ind.listProperties(ind.getModel().getProperty(propertyURI));
+    		while (sit.hasNext()) {
+    			Statement s = sit.nextStatement();
+    			if (!s.getSubject().canAs(OntResource.class) || !s.getObject().canAs(OntResource.class)) {
+    			    continue;	
+    			}
+    			Individual subj = new IndividualJena((OntResource) s.getSubject().as(OntResource.class), webappDaoFactory);
+    			Individual obj = new IndividualJena((OntResource) s.getObject().as(OntResource.class), webappDaoFactory);
+    			ObjectProperty op = webappDaoFactory.getObjectPropertyDao().getObjectPropertyByURI(s.getPredicate().getURI());
+    			if (subj != null && obj != null && op != null) {
+    				ObjectPropertyStatement ops = new ObjectPropertyStatementImpl();
+    				ops.setSubject(subj);
+    				ops.setSubjectURI(subj.getURI());
+    				ops.setObject(obj);
+    				ops.setObjectURI(obj.getURI());
+    				ops.setProperty(op);
+    				ops.setPropertyURI(op.getURI());
+    				objectPropertyStatements.add(ops);
+    			}
+    		}
+     	} finally {
+    		ind.getOntModel().leaveCriticalSection();
+    	}
+     	return objectPropertyStatements;
+    }
+
+    @Override
+    public List<Individual> getRelatedIndividuals(String propertyURI) {
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	List<Individual> relatedIndividuals = new ArrayList<Individual>();
+    	ind.getOntModel().enterCriticalSection(Lock.READ);
+    	try {
+    	    NodeIterator values = ind.listPropertyValues(ind.getModel().getProperty(propertyURI));
+    	    while (values.hasNext()) {
+    	    	RDFNode value = values.nextNode();
+    	    	if (value.canAs(OntResource.class)) {
+        	    	relatedIndividuals.add(
+        	    		new IndividualJena((OntResource) value.as(OntResource.class), webappDaoFactory) );  
+        	    } 
+    	    }
+    	} finally {
+    		ind.getOntModel().leaveCriticalSection();
+    	}
+    	return relatedIndividuals;
+    }
+    
+    @Override
+    public Individual getRelatedIndividual(String propertyURI) {
+    	if (propertyURI == null) {
+    		return null;
+    	}
+    	ind.getOntModel().enterCriticalSection(Lock.READ);
+    	try {
+    	    RDFNode value = ind.getPropertyValue(ind.getModel().getProperty(propertyURI));
+    	    if (value != null && value.canAs(OntResource.class)) {
+    	    	return new IndividualJena((OntResource) value.as(OntResource.class), webappDaoFactory);  
+    	    } else {
+    	    	return null;
+    	    }
+    	} finally {
+    		ind.getOntModel().leaveCriticalSection();
+    	}
+    }
+    
+    public List<ObjectProperty> getObjectPropertyList() {
+        if (this.propertyList != null) {
+            return this.propertyList;
+        } else {
+            try {
+                webappDaoFactory.getObjectPropertyDao().fillObjectPropertiesForIndividual( this );
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fillEntityProperties for "+this.getURI());
+            }
+            return this.propertyList;
+        }
+    }
+    
+    @Override
+    public Map<String,ObjectProperty> getObjectPropertyMap() {
+    	if (this.objectPropertyMap != null) {
+    		return objectPropertyMap;
+    	} else {
+    		Map map = new HashMap<String,ObjectProperty>();
+    		if (this.propertyList == null) {
+    			getObjectPropertyList();
+    		}
+    		for (Iterator i = this.propertyList.iterator(); i.hasNext();) { 
+    			ObjectProperty op = (ObjectProperty) i.next();
+    			if (op.getURI() != null) {
+    				map.put(op.getURI(), op);
+    			}
+    		}
+    		this.objectPropertyMap = map;
+    		return map;    		
+    	}
+    }
+
+    public List<DataPropertyStatement> getDataPropertyStatements() {
+        if (this.dataPropertyStatements != null) {
+            return this.dataPropertyStatements;
+        } else {
+            try {
+                webappDaoFactory.getDataPropertyStatementDao().fillExistingDataPropertyStatementsForIndividual(this/*,false*/);
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill existing DataPropertyStatements for "+this.getURI());
+            }
+            return this.dataPropertyStatements;
+        }
+    }
+
+    public List getDataPropertyList() {
+        if (this.datatypePropertyList != null) {
+            return this.datatypePropertyList;
+        } else {
+            try {
+                webappDaoFactory.getDataPropertyDao().fillDataPropertiesForIndividual( this );
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill data properties for "+this.getURI());
+            }
+            return this.datatypePropertyList;
+        }
+    }
+    
+    @Override
+    public Map<String,DataProperty> getDataPropertyMap() {
+    	if (this.dataPropertyMap != null) {
+    		return dataPropertyMap;
+    	} else {
+    		Map map = new HashMap<String,DataProperty>();
+    		if (this.datatypePropertyList == null) {
+    			getDataPropertyList();
+    		}
+    		for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { 
+    			DataProperty dp = (DataProperty) i.next();
+    			if (dp.getURI() != null) {
+    				map.put(dp.getURI(), dp);
+    			}
+    		}
+    		this.dataPropertyMap = map;
+    		return map;    		
+    	}
+    }
+
+    public List<DataPropertyStatement> getExternalIds() {
+        // BJL 2007-11-11: need to decide whether we want to use Collections or Lists in our interfaces - we seem to be leaning toward Lists
+        if (this.externalIds != null) {
+            return this.externalIds;
+        } else {
+            try {
+                List<DataPropertyStatement> dpsList = new ArrayList<DataPropertyStatement>();
+                dpsList.addAll(webappDaoFactory.getIndividualDao().getExternalIds(this.getURI(), null));
+                this.externalIds = dpsList;
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not fill external IDs for "+this.getURI());
+            }
+            return this.externalIds;
+        }
+    }
+    
+    @Override
+    public List<VClass> getVClasses() {
+    	return getVClasses(false);
+    }
+    
+    @Override
+    public List<VClass> getVClasses(boolean direct) {
+    	if (direct) {
+    		if (directVClasses != null) {
+    			return directVClasses;
+    		} else {
+    			directVClasses = getMyVClasses(true);
+    			return directVClasses;
+    		}
+    	} else {
+    		if (allVClasses != null) {
+    			return allVClasses;
+    		} else {
+    			allVClasses = getMyVClasses(false);
+    			return allVClasses;
+    		}
+    	}
+    }
+    
+    private List<VClass> getMyVClasses(boolean direct) {
+		List<VClass> vClassList = new ArrayList<VClass>(); 
+		OntModel ontModel = ind.getOntModel();
+		ontModel.enterCriticalSection(Lock.READ);
+		try {
+			ClosableIterator typeIt = ind.listRDFTypes(false && direct); 
+			try {
+				for (Iterator it = typeIt; it.hasNext();) {
+					Resource type = (Resource) typeIt.next();
+					String typeURI = (!type.isAnon()) ? type.getURI() : VitroVocabulary.PSEUDO_BNODE_NS + type.getId().toString();
+					if (type.getNameSpace() == null || (!webappDaoFactory.getNonuserNamespaces().contains(type.getNameSpace())) ) {
+						VClass vc = webappDaoFactory.getVClassDao().getVClassByURI(typeURI);
+						if (vc != null) {
+							vClassList.add(vc);
+						}
+					}
+					
+				}
+			} finally {
+				typeIt.close();
+			}
+		} finally {
+			ontModel.leaveCriticalSection();
+		}
+		try {
+			Collections.sort(vClassList);
+		} catch (Exception e) {}
+		return vClassList;
+	}
+    
+	/**
+	 * The base method in {@link IndividualImpl} is adequate if the reasoner is
+	 * up to date. 
+	 * 
+	 * If the base method returns false, check directly to see if
+	 * any of the super classes of the direct classes will satisfy this request.
+	 */
+	@Override
+	public boolean isVClass(String uri) {
+    	if (uri == null) {
+    		return false;
+    	}
+
+		if (super.isVClass(uri)) {
+			return true;
+		}
+
+		VClassDao vclassDao = webappDaoFactory.getVClassDao();
+		for (VClass vClass : getVClasses(true)) {
+			for (String superClassUri: vclassDao.getAllSuperClassURIs(vClass.getURI())) {
+				if (uri.equals(superClassUri)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean isMemberOfClassProhibitedFromSearch(ProhibitedFromSearch pfs) {
+		ind.getModel().enterCriticalSection(Lock.READ);
+		try {
+			StmtIterator stmtIt = ind.listProperties(RDF.type);
+			try {
+				while(stmtIt.hasNext()) {
+					Statement stmt = stmtIt.nextStatement();
+					if (stmt.getObject().isURIResource()) {
+						String typeURI = ((Resource)stmt.getObject()).getURI();
+						if (pfs.isClassProhibited(typeURI)) {
+							return false;
+						}
+					}
+				}
+			} finally {
+				stmtIt.close();
+			}
+			return false;
+		} finally {
+			ind.getModel().leaveCriticalSection();
+		}
+	}
+
+    /**
+     * Overriding the base method so that we can do the sorting by arbitrary property here.  An
+     * IndividualJena has a reference back to the model; everything else is just a dumb bean (for now).
+     */
+    @Override
+    protected void sortEnts2EntsForDisplay(){
+        if( getObjectPropertyList() == null ) return;
+
+        Iterator it = getObjectPropertyList().iterator();
+        while(it.hasNext()){
+            ObjectProperty prop = (ObjectProperty)it.next();
+        /*  if (prop.getObjectIndividualSortPropertyURI()==null) {
+            	prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+            } else {*/
+            	prop.sortObjectPropertyStatementsForDisplay(prop,prop.getObjectPropertyStatements());
+        /*  }*/
+        }
+    }
+    
+    private Collator collator = Collator.getInstance();
+    
+    private void sortObjectPropertyStatementsForDisplay(ObjectProperty prop) {
+    	try {
+    		log.info("Doing special sort for "+prop.getDomainPublic());
+    		final String sortPropertyURI = prop.getObjectIndividualSortPropertyURI();
+            String tmpDir;
+            boolean tmpAsc;
+
+            tmpDir = prop.getDomainEntitySortDirection();
+
+            //valid values are "desc" and "asc", anything else will default to ascending
+            tmpAsc = !"desc".equalsIgnoreCase(tmpDir);
+
+            final boolean dir = tmpAsc;
+            Comparator comp = new Comparator(){
+                final boolean cAsc = dir;
+
+                public final int compare(Object o1, Object o2){
+                    ObjectPropertyStatement e2e1= (ObjectPropertyStatement)o1, e2e2=(ObjectPropertyStatement)o2;
+                    Individual e1 , e2;
+                    e1 = e2e1 != null ? e2e1.getObject():null;
+                    e2 = e2e2 != null ? e2e2.getObject():null;
+
+                    Object val1 = null, val2 = null;
+                    if( e1 != null ){
+                        try {
+                        	DataProperty dp = e1.getDataPropertyMap().get(sortPropertyURI);
+                        	if (dp.getDataPropertyStatements() != null && dp.getDataPropertyStatements().size()>0) {
+                        		val1 = dp.getDataPropertyStatements().get(0).getData();
+                        	}
+                        }
+                        catch (Exception e) {
+                        	val1 = "";
+                        }
+                    } else {
+                        log.warn( "IndividualJena.sortObjectPropertiesForDisplay passed object property statement with no range entity.");
+                    }
+
+                    if( e2 != null ){
+                        try {
+                        	DataProperty dp = e2.getDataPropertyMap().get(sortPropertyURI);
+                        	if (dp.getDataPropertyStatements() != null && dp.getDataPropertyStatements().size()>0) {
+                        		val2 = dp.getDataPropertyStatements().get(0).getData();
+                        	}
+                        }
+                        catch (Exception e) {
+                        	val2 = "";
+                        }
+                    } else {
+                        log.warn( "IndividualJena.sortObjectPropertyStatementsForDisplay() was passed an object property statement with no range entity.");
+                    }
+
+                    int rv = 0;
+                    try {
+                        if( val1 instanceof String )
+                        	rv = collator.compare( ((String)val1) , ((String)val2) );
+                            //rv = ((String)val1).compareTo((String)val2);
+                        else if( val1 instanceof Date ) {
+                            DateTime dt1 = new DateTime((Date)val1);
+                            DateTime dt2 = new DateTime((Date)val2);
+                            rv = dt1.compareTo(dt2);
+                        }
+                        else
+                            rv = 0;
+                    } catch (NullPointerException e) {
+                        e.printStackTrace();
+                    }
+
+                    if( cAsc )
+                        return rv;
+                    else
+                        return rv * -1;
+                }
+            };
+            try {
+                Collections.sort(getObjectPropertyStatements(), comp);
+            } catch (Exception e) {
+                log.error("Exception sorting object property statements for object property "+this.getURI());
+            }
+
+    		
+    	} catch (Exception e) {
+    		log.error(e);
+    	}
+    }
+    
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/KeywordIndividualRelationDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/KeywordIndividualRelationDaoJena.java
index 4449997b6..3c4b36637 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/KeywordIndividualRelationDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/KeywordIndividualRelationDaoJena.java
@@ -10,6 +10,7 @@ import java.util.List;
 import com.hp.hpl.jena.ontology.OntClass;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.rdf.model.Statement;
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.util.iterator.ClosableIterator;
@@ -68,7 +69,7 @@ public class KeywordIndividualRelationDaoJena extends JenaBaseDao implements Key
             }
             getOntModel().enterCriticalSection(Lock.READ);
             try {
-                com.hp.hpl.jena.ontology.Individual individual = getOntModel().getIndividual(individualURI);
+                Resource individual = ResourceFactory.createResource(individualURI);
                 if (individual != null) {
                     ClosableIterator stmtIt = getOntModel().listStatements(null, KEYWORD_INDIVIDUALRELATION_INVOLVESINDIVIDUAL, individual);
                     try {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java
index 4507cd917..8d7dc7670 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/LinksDaoJena.java
@@ -19,6 +19,7 @@ import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.rdf.model.Statement;
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.util.iterator.ClosableIterator;
@@ -47,7 +48,7 @@ public class LinksDaoJena extends JenaBaseDao implements LinksDao {
         List<Link> linksList = new ArrayList<Link>();
         getOntModel().enterCriticalSection(Lock.READ);
         try {
-            com.hp.hpl.jena.ontology.Individual entInd = getOntModel().getIndividual(individual.getURI());
+            Resource entInd = ResourceFactory.createResource(individual.getURI());
             if (ADDITIONAL_LINK != null) {
                 ClosableIterator<Statement> links = getOntModel().listStatements(entInd,ADDITIONAL_LINK,(Resource)null);
                 try {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
index a707daa84..c3f7e752a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoJena.java
@@ -61,9 +61,10 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
         	
         	ObjectPropertyDaoJena opDaoJena = new ObjectPropertyDaoJena(getWebappDaoFactory());
         	
-        	getOntModel().enterCriticalSection(Lock.READ);
+        	OntModel ontModel = getOntModelSelector().getABoxModel();
+        	ontModel.enterCriticalSection(Lock.READ);
         	try {
-	            Resource ind = getOntModel().getResource(entity.getURI());
+	            Resource ind = ontModel.getResource(entity.getURI());
 	            List<ObjectPropertyStatement> objPropertyStmtList = new ArrayList<ObjectPropertyStatement>();
 	            ClosableIterator<Statement> propIt = ind.listProperties();
 	            try {
@@ -119,7 +120,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
 	            }
 	            entity.setObjectPropertyStatements(objPropertyStmtList);
         	} finally {
-        		getOntModel().leaveCriticalSection();
+        		ontModel.leaveCriticalSection();
         	}
             return entity;
         }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java
new file mode 100644
index 000000000..5dbfab75e
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyStatementDaoSDB.java
@@ -0,0 +1,139 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+public class ObjectPropertyStatementDaoSDB extends
+		ObjectPropertyStatementDaoJena implements ObjectPropertyStatementDao {
+
+	private Dataset dataset;
+	
+	public ObjectPropertyStatementDaoSDB(Dataset dataset, WebappDaoFactoryJena wadf) {
+		super (wadf);
+		this.dataset = dataset;
+	}
+	
+	@Override
+    public Individual fillExistingObjectPropertyStatements(Individual entity) {
+        if (entity.getURI() == null)
+            return entity;
+        else {
+        	Map<String, ObjectProperty> uriToObjectProperty = new HashMap<String,ObjectProperty>();
+        	String query = "CONSTRUCT { \n" +
+        			       "   <" + entity.getURI() + "> ?p ?o . \n" +
+        			       "   ?o a ?oType . \n" +
+        			       "   ?o <" + RDFS.label.getURI() + "> ?oLabel .  \n" +
+        			       "   ?o <" + VitroVocabulary.MONIKER + "> ?oMoniker  \n" +
+        			       "} WHERE { GRAPH ?g { \n" +
+        			       "   <" + entity.getURI() + "> ?p ?o . \n" +
+        			       "   ?o a ?oType \n" +
+        			       "   OPTIONAL { ?o <" + RDFS.label.getURI() + "> ?oLabel }  \n" +
+        			       "   OPTIONAL { ?o <" + VitroVocabulary.MONIKER + "> ?oMoniker }  \n" +
+                           "} }";
+        	long startTime = System.currentTimeMillis();
+        	dataset.getLock().enterCriticalSection(Lock.READ);
+        	Model m = null;
+        	try {
+        		m = QueryExecutionFactory.create(QueryFactory.create(query), dataset).execConstruct();
+        	} finally {
+        		dataset.getLock().leaveCriticalSection();
+        	}
+        	if (log.isDebugEnabled()) {
+	        	log.debug("Time (ms) to query for related individuals: " + (System.currentTimeMillis() - startTime));
+	        	if (System.currentTimeMillis() - startTime > 1000) {
+	        		//log.debug(query);
+	        		log.debug("Results size (statements): " + m.size());
+	        	}
+        	}
+        	
+        	OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, m);
+        	ontModel.enterCriticalSection(Lock.READ);
+        	try {
+	            Resource ind = ontModel.getResource(entity.getURI());
+	            List<ObjectPropertyStatement> objPropertyStmtList = new ArrayList<ObjectPropertyStatement>();
+	            ClosableIterator<Statement> propIt = ind.listProperties();
+	            try {
+	                while (propIt.hasNext()) {
+	                    Statement st = (Statement) propIt.next();
+	                    
+	                    if (st.getObject().isResource() && !(NONUSER_NAMESPACES.contains(st.getPredicate().getNameSpace()))) {
+	                        try {
+	                            ObjectPropertyStatement objPropertyStmt = new ObjectPropertyStatementImpl();
+	                            objPropertyStmt.setSubjectURI(entity.getURI());
+	                            objPropertyStmt.setSubject(entity);
+	                            try {
+	                                objPropertyStmt.setObjectURI(((Resource)st.getObject()).getURI());
+	                            } catch (Throwable t) {
+	                                t.printStackTrace();
+	                            }
+	                            objPropertyStmt.setPropertyURI(st.getPredicate().getURI());
+	                            try {
+	                                Property prop = st.getPredicate();
+	                                if( uriToObjectProperty.containsKey(prop.getURI())){
+	                                	objPropertyStmt.setProperty(uriToObjectProperty.get(prop.getURI()));
+	                                }else{
+	                                	ObjectProperty p = getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(prop.getURI());
+	                                	if( p != null ){
+	                                		uriToObjectProperty.put(prop.getURI(), p);
+	                                		objPropertyStmt.setProperty(uriToObjectProperty.get(prop.getURI()));
+	                                	}else{
+	                                		//if ObjectProperty not found in ontology, skip it
+	                                		continue;
+	                                	}
+	                                }                                
+	                            } catch (Throwable g) {
+	                                //do not add statement to list
+	                            	log.debug("exception while trying to get object property for statement list, statement skipped.", g);
+	                            	continue;                                                                
+	                            }
+	                            if (objPropertyStmt.getObjectURI() != null) {
+	                                Individual objInd = new IndividualSDB(objPropertyStmt.getObjectURI(), dataset, getWebappDaoFactory(), m);
+	                                objPropertyStmt.setObject(objInd);
+	                            }
+	
+	                            //add object property statement to list for Individual
+	                            if ((objPropertyStmt.getSubjectURI() != null) && (objPropertyStmt.getPropertyURI() != null) && (objPropertyStmt.getObject() != null)){
+	                                objPropertyStmtList.add(objPropertyStmt);                           
+	                            } 
+	                        } catch (Throwable t) {
+	                            t.printStackTrace();
+	                        }
+	                    }
+	                }
+	            } finally {
+	                propIt.close();
+	            }
+	            entity.setObjectPropertyStatements(objPropertyStmtList);
+        	} finally {
+        		ontModel.leaveCriticalSection();
+        	}
+            return entity;
+        }
+    }
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
new file mode 100644
index 000000000..26183701d
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
@@ -0,0 +1,68 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import com.hp.hpl.jena.ontology.OntModel;
+
+public class OntModelSelectorImpl implements OntModelSelector {
+
+	private OntModel aboxModel;
+	private OntModel applicationMetadataModel;
+	private OntModel displayModel;
+	private OntModel fullModel;
+	private OntModel tboxModel;
+	private OntModel userAccountsModel;
+	
+	public OntModel getABoxModel() {
+		return this.aboxModel;
+	}
+
+	public OntModel getApplicationMetadataModel() {
+		return this.applicationMetadataModel;
+	}
+
+	public OntModel getDisplayModel() {
+		return this.displayModel;
+	}
+
+	public OntModel getFullModel() {
+		return this.fullModel;
+	}
+
+	public OntModel getTBoxModel() {
+		return this.tboxModel;
+	}
+
+	public OntModel getTBoxModel(String ontologyURI) {
+		return this.tboxModel;
+	}
+
+	public OntModel getUserAccountsModel() {
+		return this.userAccountsModel;
+	}
+	
+	public void setABoxModel(OntModel m) {
+		this.aboxModel = m;
+	}
+	
+	public void setApplicationMetadataModel(OntModel m) {
+		this.applicationMetadataModel = m;
+	}
+
+	public void setDisplayModel(OntModel m) {
+		this.displayModel = m;
+	}
+	
+	public void setTBoxModel(OntModel m) {
+		this.tboxModel = m;
+	}
+	
+	public void setUserAccountsModel(OntModel m) {
+		this.userAccountsModel = m;
+	}
+	
+	public void setFullModel(OntModel m) {
+		this.fullModel = m;
+	}
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
new file mode 100644
index 000000000..11479df54
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SDBGraphGenerator.java
@@ -0,0 +1,50 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.sdb.SDBFactory;
+import com.hp.hpl.jena.sdb.Store;
+import com.hp.hpl.jena.sdb.StoreDesc;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public class SDBGraphGenerator implements GraphGenerator {
+
+	private static final Log log = LogFactory.getLog(SDBGraphGenerator.class.getName());
+	
+    private BasicDataSource ds;
+    private Connection connection;
+    private StoreDesc storeDesc;
+    private String graphID;
+	
+    public SDBGraphGenerator(BasicDataSource dataSource, StoreDesc storeDesc,
+    							String graphID) {
+    	this.ds = dataSource;
+    	this.storeDesc = storeDesc;
+    	this.graphID = graphID;
+    }
+    
+	public Graph generateGraph() {
+		try {
+			if ( ( this.connection == null ) || ( this.connection.isClosed() ) ) {
+				this.connection = ds.getConnection();
+			}
+			Store store = SDBFactory.connectStore(connection, storeDesc);
+			return SDBFactory.connectNamedGraph(store, graphID); 
+		} catch (SQLException e) {
+			String errMsg = "Unable to generate SDB graph"; 
+			log.error(errMsg, e);
+			throw new RuntimeException(errMsg, e);
+		}
+	}
+	
+	public Connection getConnection() {
+		return connection;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
index 807b38798..a27b107c0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoJena.java
@@ -27,7 +27,14 @@ import com.hp.hpl.jena.ontology.ProfileException;
 import com.hp.hpl.jena.ontology.Restriction;
 import com.hp.hpl.jena.ontology.SomeValuesFromRestriction;
 import com.hp.hpl.jena.ontology.UnionClass;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.Syntax;
 import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.rdf.model.ResourceFactory;
@@ -775,10 +782,10 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
             getOntModel().enterCriticalSection(Lock.READ);
             try {
                 if ((group != null) && (group.getURI() != null)) {
-                    Individual groupInd = getOntModel().getIndividual(group.getURI());
+                    Resource groupRes = ResourceFactory.createResource(group.getURI());
                     AnnotationProperty inClassGroup = getOntModel().getAnnotationProperty(VitroVocabulary.IN_CLASSGROUP);
                     if (inClassGroup != null) {
-                        ClosableIterator annotIt = getOntModel().listStatements((OntClass)null,inClassGroup,groupInd);
+                        ClosableIterator annotIt = getOntModel().listStatements((OntClass)null,inClassGroup,groupRes);
                         try {
                             while (annotIt.hasNext()) {
                                 try {
@@ -788,20 +795,39 @@ public class VClassDaoJena extends JenaBaseDao implements VClassDao {
                                     if (vcw != null) {
                                         boolean classIsInstantiated = false;
                                         if (getIndividualCount) {
-                                        	int count = getOntModel().listStatements(null,RDF.type,cls).toList().size();
+                                        	Model aboxModel = getOntModelSelector().getABoxModel();
+                                        	aboxModel.enterCriticalSection(Lock.READ);
+                                        	int count = 0;
+                                        	try {
+                                        		String countQueryStr = "SELECT COUNT(*) WHERE \n" +
+                                        		                       "{ ?s a <" + cls.getURI() + "> } \n";
+                                        		Query countQuery = QueryFactory.create(countQueryStr, Syntax.syntaxARQ);
+                                        		QueryExecution qe = QueryExecutionFactory.create(countQuery, aboxModel);
+                                        		ResultSet rs =qe.execSelect();
+                                        		count = Integer.parseInt(((Literal) rs.nextSolution().get(".1")).getLexicalForm());
+                                        		//count = aboxModel.listStatements(null,RDF.type,cls).toList().size();
+                                        	} finally {
+                                        		aboxModel.leaveCriticalSection();
+                                        	}
                                         	vcw.setEntityCount(count);
                                         	classIsInstantiated = (count > 0);
                                         } else if (includeUninstantiatedClasses == false) {
 	                                        // Note: to support SDB models, may want to do this with 
 	                                        // SPARQL and LIMIT 1 if SDB can take advantage of it
-	                                        ClosableIterator countIt = getOntModel().listStatements(null,RDF.type,cls);
-	                                        try {
-	                                            if (countIt.hasNext()) {
-	                                            	classIsInstantiated = true;
-	                                            }
-	                                        } finally {
-	                                            countIt.close();
-	                                        }
+                                        	Model aboxModel = getOntModelSelector().getABoxModel();
+                                        	aboxModel.enterCriticalSection(Lock.READ);
+                                        	try {
+		                                        ClosableIterator countIt = aboxModel.listStatements(null,RDF.type,cls);
+		                                        try {
+		                                            if (countIt.hasNext()) {
+		                                            	classIsInstantiated = true;
+		                                            }
+		                                        } finally {
+		                                            countIt.close();
+		                                        }
+                                        	} finally {
+                                        		aboxModel.leaveCriticalSection();
+                                        	}
                                         }
                                         
                                         if (includeUninstantiatedClasses || classIsInstantiated) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
new file mode 100644
index 000000000..14227aced
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
@@ -0,0 +1,110 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import com.hp.hpl.jena.ontology.AnnotationProperty;
+import com.hp.hpl.jena.ontology.OntClass;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+public class VClassDaoSDB extends VClassDaoJena {
+
+	private Dataset dataset;
+	private WebappDaoFactoryJena wadf;
+	
+    public VClassDaoSDB(Dataset dataset, WebappDaoFactoryJena wadf) {
+        super(wadf);
+        this.dataset = dataset;
+    }
+    
+    protected Dataset getDataset() {
+    	return this.dataset;
+    }
+    
+    @Deprecated
+    public void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses, boolean getIndividualCount) {
+        getOntModel().enterCriticalSection(Lock.READ);
+        try {
+            if ((group != null) && (group.getURI() != null)) {
+                Resource groupRes = ResourceFactory.createResource(group.getURI());
+                AnnotationProperty inClassGroup = getOntModel().getAnnotationProperty(VitroVocabulary.IN_CLASSGROUP);
+                if (inClassGroup != null) {
+                    ClosableIterator annotIt = getOntModel().listStatements((OntClass)null,inClassGroup,groupRes);
+                    try {
+                        while (annotIt.hasNext()) {
+                            try {
+                                Statement annot = (Statement) annotIt.next();
+                                Resource cls = (Resource) annot.getSubject();
+                                VClass vcw = (VClass) getVClassByURI(cls.getURI());
+                                if (vcw != null) {
+                                    boolean classIsInstantiated = false;
+                                    if (getIndividualCount) {
+                                    	Model aboxModel = getOntModelSelector().getABoxModel();
+                                    	aboxModel.enterCriticalSection(Lock.READ);
+                                    	int count = 0;
+                                    	try {
+                                    		String countQueryStr = "SELECT COUNT(*) WHERE \n" +
+                                    		                       "{ GRAPH ?g { ?s a <" + cls.getURI() + "> } } \n";
+                                    		Query countQuery = QueryFactory.create(countQueryStr, Syntax.syntaxARQ);
+                                    		QueryExecution qe = QueryExecutionFactory.create(countQuery, getDataset());
+                                    		ResultSet rs =qe.execSelect();
+                                    		count = Integer.parseInt(((Literal) rs.nextSolution().get(".1")).getLexicalForm());
+                                    	} finally {
+                                    		aboxModel.leaveCriticalSection();
+                                    	}
+                                    	vcw.setEntityCount(count);
+                                    	classIsInstantiated = (count > 0);
+                                    } else if (includeUninstantiatedClasses == false) {
+                                        // Note: to support SDB models, may want to do this with 
+                                        // SPARQL and LIMIT 1 if SDB can take advantage of it
+                                    	Model aboxModel = getOntModelSelector().getABoxModel();
+                                    	aboxModel.enterCriticalSection(Lock.READ);
+                                    	try {
+	                                        ClosableIterator countIt = aboxModel.listStatements(null,RDF.type,cls);
+	                                        try {
+	                                            if (countIt.hasNext()) {
+	                                            	classIsInstantiated = true;
+	                                            }
+	                                        } finally {
+	                                            countIt.close();
+	                                        }
+                                    	} finally {
+                                    		aboxModel.leaveCriticalSection();
+                                    	}
+                                    }
+                                    
+                                    if (includeUninstantiatedClasses || classIsInstantiated) {
+                                        group.add(vcw);
+                                    }
+                                }
+                            } catch (ClassCastException cce) {cce.printStackTrace();}
+                        }
+                    } finally {
+                        annotIt.close();
+                    }
+                }
+            }
+            java.util.Collections.sort(group.getVitroClassList());
+        } finally {
+            getOntModel().leaveCriticalSection();
+        }
+    }
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
index 60f404b8e..e29ca6b16 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactoryJena.java
@@ -549,7 +549,7 @@ public class WebappDaoFactoryJena implements WebappDaoFactory {
         return propertyInstanceDao;
     }
 
-    private VClassDao vClassDao = null;
+    protected VClassDao vClassDao = null;
     public VClassDao getVClassDao() {
         if( vClassDao == null )
             vClassDao = new VClassDaoJena(this);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
new file mode 100644
index 000000000..2bc0ac092
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java
@@ -0,0 +1,60 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.HashSet;
+
+import com.hp.hpl.jena.query.Dataset;
+
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+
+public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
+
+	private Dataset dataset;
+	
+	public WebappDaoFactorySDB(OntModelSelector ontModelSelector, Dataset dataset) {
+		super(ontModelSelector);
+		this.dataset = dataset;
+	}
+	
+	public WebappDaoFactorySDB(OntModelSelector ontModelSelector, Dataset dataset, String defaultNamespace, HashSet<String> nonuserNamespaces, String[] preferredLanguages) {
+		super(ontModelSelector, defaultNamespace, nonuserNamespaces, preferredLanguages);
+        this.dataset = dataset;
+	}
+	
+	@Override
+    public IndividualDao getIndividualDao() {
+        if (entityWebappDao != null)
+            return entityWebappDao;
+        else
+            return entityWebappDao = new IndividualDaoSDB(dataset, this);
+    }
+	
+	@Override
+	public DataPropertyStatementDao getDataPropertyStatementDao() {
+		if (dataPropertyStatementDao != null) 
+			return dataPropertyStatementDao;
+		else
+			return dataPropertyStatementDao = new DataPropertyStatementDaoSDB(dataset, this);
+	}
+	
+	@Override
+	public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
+		if (objectPropertyStatementDao != null) 
+			return objectPropertyStatementDao;
+		else
+			return objectPropertyStatementDao = new ObjectPropertyStatementDaoSDB(dataset, this);
+	}
+	
+	@Override
+	public VClassDao getVClassDao() {
+		if (vClassDao != null) 
+			return vClassDao;
+		else
+			return vClassDao = new VClassDaoSDB(dataset, this);
+	}
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StandardModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StandardModelSelector.java
index 6e3f968b1..1313a9667 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StandardModelSelector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StandardModelSelector.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.hp.hpl.jena.ontology.OntModel;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 
 public class StandardModelSelector implements ModelSelector {
 
@@ -15,13 +16,18 @@ public class StandardModelSelector implements ModelSelector {
         VitroRequest vreq = new VitroRequest( request );        
         
         Object sessionOntModel = null;
-        if( vreq.getSession() != null)
-            sessionOntModel = vreq.getSession().getAttribute("jenaOntModel");            
-        
+        if( vreq.getSession() != null) {
+            OntModelSelector oms = (OntModelSelector) vreq.getSession()
+            							.getAttribute("unionOntModelSelector");
+            if (oms != null) {
+            	sessionOntModel = oms.getABoxModel();
+            }
+        }
         if(sessionOntModel != null && sessionOntModel instanceof OntModel )
             return (OntModel)sessionOntModel;
         else 
-            return (OntModel)context.getAttribute("jenaOntModel");              
+            return ((OntModelSelector) context
+            			.getAttribute("unionOntModelSelector")).getABoxModel();              
     }
     
     public static final ModelSelector selector = new StandardModelSelector();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
index a18620221..e8ec1b1e9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
@@ -128,7 +128,7 @@ public class VitroRequestPrep implements Filter {
         vreq.setSunsetFlag(sunsetFlag);
 
         //-- setup DAO factory --//
-        WebappDaoFactory wdf = getWebappDaoFactory();
+        WebappDaoFactory wdf = getWebappDaoFactory(vreq);
         //TODO: get accept-language from request and set as preferred languages
         
         //-- setup portal and portalFlag --//
@@ -199,8 +199,10 @@ public class VitroRequestPrep implements Filter {
         chain.doFilter(request, response);
     }
 
-    private WebappDaoFactory getWebappDaoFactory(){
-        return (WebappDaoFactory) _context.getAttribute("webappDaoFactory");
+    private WebappDaoFactory getWebappDaoFactory(VitroRequest vreq){
+    	WebappDaoFactory webappDaoFactory = vreq.getWebappDaoFactory();
+        return (webappDaoFactory != null) ? webappDaoFactory :
+        	(WebappDaoFactory) _context.getAttribute("webappDaoFactory");
     }
 
     public void init(FilterConfig filterConfig) throws ServletException {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
new file mode 100644
index 000000000..53b7d21bb
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
@@ -0,0 +1,135 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filters;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.sdb.SDBFactory;
+import com.hp.hpl.jena.sdb.Store;
+import com.hp.hpl.jena.sdb.StoreDesc;
+import com.hp.hpl.jena.sdb.sql.SDBConnection;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
+import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
+
+public class WebappDaoFactorySDBPrep implements Filter {
+	
+	private final static Log log = LogFactory.getLog(WebappDaoFactorySDBPrep.class);
+	
+	BasicDataSource _bds;
+	StoreDesc _storeDesc;
+	SDBConnection _conn;
+	OntModelSelector _oms;
+	String _defaultNamespace;
+
+    /**
+     * The filter will be applied to all incoming urls,
+     this is a list of URI patterns to skip.  These are
+     matched against the requestURI sans query parameters,
+     * e.g.
+     * "/vitro/index.jsp"
+     * "/vitro/themes/enhanced/css/edit.css"
+     *
+     * These patterns are from VitroRequestPrep.java
+    */
+    Pattern[] skipPatterns = {
+            Pattern.compile(".*\\.(gif|GIF|jpg|jpeg)$"),
+            Pattern.compile(".*\\.css$"),
+            Pattern.compile(".*\\.js$"),
+            Pattern.compile("/.*/themes/.*/site_icons/.*"),
+            Pattern.compile("/.*/images/.*")
+    };
+	
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain filterChain) throws IOException, ServletException {
+		
+		if (request.getAttribute("WebappDaoFactorySDBPrep.setup") != null) {
+			// don't run multiple time
+			return;
+		}
+		
+		for( Pattern skipPattern : skipPatterns){
+            Matcher match =skipPattern.matcher( ((HttpServletRequest)request).getRequestURI() );
+            if( match.matches()  ){
+                log.debug("request matched a skipPattern, skipping VitroRequestPrep"); 
+                filterChain.doFilter(request, response);
+                return;
+            }
+        }
+		
+		SDBConnection conn = null;
+		
+		try {
+		if (
+				request instanceof HttpServletRequest &&
+				_bds != null && _storeDesc != null && _oms != null) {
+			try {
+				conn = new SDBConnection(_bds.getConnection()) ;
+			} catch (SQLException sqe) {
+				throw new RuntimeException("Unable to connect to database", sqe);
+			}
+			if (conn != null) {
+				Store store = SDBFactory.connectStore(conn, _storeDesc);
+				Dataset dataset = SDBFactory.connectDataset(store);
+				VitroRequest vreq = new VitroRequest((HttpServletRequest) request);
+				WebappDaoFactory wadf = 
+					new WebappDaoFactorySDB(_oms, dataset, _defaultNamespace, null, null);
+				vreq.setWebappDaoFactory(wadf);
+				vreq.setFullWebappDaoFactory(wadf);
+				vreq.setDataset(dataset);
+			}
+		}
+		} catch (Throwable t) {
+			t.printStackTrace();
+		}
+		
+		request.setAttribute("WebappDaoFactorySDBPrep.setup", 1);
+		
+		try {
+			filterChain.doFilter(request, response);
+			return;
+		} finally {
+			if (conn != null) {
+				conn.close();
+			}
+		}
+		
+	}
+
+	public void init(FilterConfig filterConfig) throws ServletException {
+		try {
+			ServletContext ctx = filterConfig.getServletContext();
+			_bds = JenaDataSourceSetupBase.getApplicationDataSource(ctx);
+		    _storeDesc = (StoreDesc) ctx.getAttribute("storeDesc");
+		    _oms = (OntModelSelector) ctx.getAttribute("unionOntModelSelector");
+		    _defaultNamespace = (String) ctx.getAttribute("defaultNamespace");
+		} catch (Throwable t) {
+			log.error("Unable to set up SDB WebappDaoFactory for request", t);
+		}		
+	}
+	
+	public void destroy() {
+		// no destroy actions
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
new file mode 100644
index 000000000..b7b9859d2
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasoner.java
@@ -0,0 +1,575 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.reasoner;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntClass;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.ontology.OntProperty;
+import com.hp.hpl.jena.rdf.listeners.StatementListener;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+/**
+ * Allows for instant incremental materialization or retraction of RDFS-
+ * style class and property subsumption based ABox inferences as statements
+ * are added to or removed from the (ABox or TBox) knowledge base.
+ *  
+ */
+
+public class SimpleReasoner extends StatementListener {
+
+	private static final Log log = LogFactory.getLog(SimpleReasoner.class);
+	//private static final MyTempLogger log = new MyTempLogger();
+	
+	private OntModel tboxModel;
+	private OntModel aboxModel;
+	private Model inferenceModel;
+	private Model inferenceRebuildModel;
+	private Model scratchpadModel;
+	
+	/**
+	 * @param tboxModel - input.  This model contains both asserted and inferred TBox axioms
+	 * @param aboxModel - input.  This model contains asserted ABox statements
+	 * @param inferenceModel - output. This is the model in which inferred (materialized) ABox statements are maintained (added or retracted).
+	 * @param inferenceRebuildModel - output. This the model temporarily used when the whole ABox inference model is rebuilt
+	 * @param inferenceScratchpadModel - output. This the model temporarily used when the whole ABox inference model is rebuilt
+ 	 */
+	public SimpleReasoner(OntModel tboxModel, OntModel aboxModel, Model inferenceModel,
+			              Model inferenceRebuildModel, Model scratchpadModel) {
+		this.tboxModel = tboxModel;
+		this.aboxModel = aboxModel; 
+		this.inferenceModel = inferenceModel;
+		this.inferenceRebuildModel = inferenceRebuildModel;
+		this.scratchpadModel = scratchpadModel;
+		
+	    aboxModel.register(this);
+	}
+	
+	/**
+	 * @param tboxModel - input.  This model contains both asserted and inferred TBox axioms
+	 * @param aboxModel - input.  This model contains asserted ABox statements
+	 * @param inferenceModel - output. This is the model in which inferred (materialized) ABox statements are maintained (added or retracted).
+ 	 */
+	public SimpleReasoner(OntModel tboxModel, OntModel aboxModel, Model inferenceModel) {
+		this.tboxModel = tboxModel;
+		this.aboxModel = aboxModel; 
+		this.inferenceModel = inferenceModel;
+		this.inferenceRebuildModel = ModelFactory.createDefaultModel();
+		this.scratchpadModel = ModelFactory.createDefaultModel();
+	}
+	
+	/*
+	 * Performs incremental selected ABox reasoning based
+	 * on a new type assertion (assertion that an individual
+	 * is of a certain type) added to the ABox.
+	 * 
+	 */
+	@Override
+	public void addedStatement(Statement stmt) {
+
+		try {
+			
+			if (stmt.getPredicate().equals(RDF.type)) {
+			   addedType(stmt, inferenceModel);
+			}
+
+		} catch (Exception e) {
+			// don't stop the edit if there's an exception
+			log.error("Exception while adding incremental inferences: ", e);
+		}
+	}
+	
+	/*
+	 * Performs incremental selected ABox reasoning based
+	 * on a removed type assertion (assertion that an individual
+	 * is of a certain type) from the ABox.
+	 * 
+	 */
+	@Override
+	public void removedStatement(Statement stmt) {
+	
+		try {
+			
+			if (stmt.getPredicate().equals(RDF.type)) {
+			   removedType(stmt);
+			}
+
+		} catch (Exception e) {
+			// don't stop the edit if there's an exception
+			log.error("Exception while retracting inferences: ", e);
+		}
+	}
+	
+	/*
+	 * Performs incremental selected ABox reasoning based
+	 * on changes to the class hierarchy.
+	 * 
+	 * Handles subclassOf and equivalentClass assertions
+	 * 
+	 */
+	public void addedTBoxStatement(Statement stmt) {
+
+		try {
+			
+			if ( !(stmt.getPredicate().equals(RDFS.subClassOf) || stmt.getPredicate().equals(RDFS.subClassOf) ) ) return;
+			  
+			log.debug("stmt = " + stmt.toString());
+			
+			OntClass subject = tboxModel.getOntClass((stmt.getSubject()).getURI());
+			OntClass object = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI()); 
+			
+			if (stmt.getPredicate().equals(RDFS.subClassOf)) {
+			   addedSubClass(subject,object);
+			} else {
+				// equivalent class is the same as subclass in both directions
+			   addedSubClass(subject,object);
+			   addedSubClass(object,subject);
+			}
+
+		} catch (Exception e) {
+			// don't stop the edit if there's an exception
+			log.error("Exception while adding incremental inferences: ", e);
+		}
+	}
+
+	/*
+	 * Performs incremental selected ABox reasoning based
+	 * on changes to the class hierarchy.
+	 * 
+	 * Handles subclassOf and equivalentClass assertions
+	 * 
+	 */
+	public void removedTBoxStatement(Statement stmt) {
+	
+		try {
+			
+			if ( !(stmt.getPredicate().equals(RDFS.subClassOf) || stmt.getPredicate().equals(RDFS.subClassOf) ) ) return;
+			  
+			log.debug("stmt = " + stmt.toString());
+			
+			OntClass subject = tboxModel.getOntClass((stmt.getSubject()).getURI());
+			OntClass object = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI()); 
+			
+			if (stmt.getPredicate().equals(RDFS.subClassOf)) {
+			   removedSubClass(subject,object);
+			} else {
+				// equivalent class is the same as subclass in both directions
+			   removedSubClass(subject,object);
+			   removedSubClass(object,subject);
+			}
+
+		} catch (Exception e) {
+			// don't stop the edit if there's an exception
+			log.error("Exception while removing incremental inferences: ", e);
+		}
+	}
+	
+	
+	/*
+	 * If it is added that B is of type A, then for each superclass of
+	 * A assert that B is of that type.
+	 * 
+	 */
+	public void addedType(Statement stmt, Model inferenceModel) {
+
+		log.debug("stmt = " + stmt.toString());
+		
+		tboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			OntClass cls = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI()); 
+			
+			if (cls != null) {
+				ExtendedIterator<OntClass> superIt = cls.listSuperClasses(false);
+				
+				while (superIt.hasNext()) {
+					OntClass parentClass = superIt.next();
+					
+					// VIVO doesn't materialize statements that assert anonymous types
+					// for individuals. Also, sharing an identical anonymous node is
+					// not allowed in owl-dl. picklist population code looks at qualities
+					// of classes not individuals.
+					if (parentClass.isAnon()) continue;
+					
+					Statement infStmt = ResourceFactory.createStatement(stmt.getSubject(), RDF.type, parentClass);
+					inferenceModel.enterCriticalSection(Lock.WRITE);
+					try {
+						if (!inferenceModel.contains(infStmt)) {
+							log.debug("Adding this inferred statement:  " + infStmt.toString() );
+							inferenceModel.add(infStmt);
+						}
+					} finally {
+						inferenceModel.leaveCriticalSection();
+					}	
+				}
+			} else {
+				log.debug("Didn't find target class (the object of the added rdf:type statement) in the TBox: " + ((Resource)stmt.getObject()).getURI());
+			}
+		} finally {
+			tboxModel.leaveCriticalSection();
+		}
+	}
+
+	/*
+	 * If it is removed that B is of type A, then for each superclass of A remove
+	 * the inferred statement that B is of that type UNLESS it is otherwise entailed
+	 * that B is of that type.
+	 * 
+	 */
+	public void removedType(Statement stmt) {
+		
+		log.debug("stmt = " + stmt.toString());
+		
+		tboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			OntClass cls = tboxModel.getOntClass(((Resource)stmt.getObject()).getURI()); 
+			
+			if (cls != null) {
+				ExtendedIterator<OntClass> superIt = cls.listSuperClasses(false);
+				while (superIt.hasNext()) {
+					OntClass parentClass = superIt.next();
+					
+					// VIVO doesn't materialize statements that assert anonymous types
+					// for individuals. Also, sharing an identical anonymous node is
+					// not allowed in owl-dl. picklist population code looks at qualities
+					// of classes not individuals.
+					if (parentClass.isAnon()) continue;  
+					
+					if (entailedType(stmt.getSubject(),parentClass)) continue;    // if a type is still entailed without the
+					                                                              // removed statement, then don't remove it
+					                                                              // from the inferences
+					
+					Statement infStmt = ResourceFactory.createStatement(stmt.getSubject(), RDF.type, parentClass);
+						
+					inferenceModel.enterCriticalSection(Lock.WRITE);
+					try {
+						if (inferenceModel.contains(infStmt)) {
+							log.debug("Removing this inferred statement:  " + infStmt.toString() + " - " + infStmt.getSubject().toString() + " - " + infStmt.getPredicate().toString() + " - " + infStmt.getObject().toString());
+							inferenceModel.remove(infStmt);
+						}
+					} finally {
+						inferenceModel.leaveCriticalSection();
+					}	
+				}
+			} else {
+				log.debug("Didn't find target class (the object of the removed rdf:type statement) in the TBox: " + ((Resource)stmt.getObject()).getURI());
+			}
+		} finally {
+			tboxModel.leaveCriticalSection();
+		}
+	}
+
+	// Returns true if it is entailed by class subsumption that subject is
+	// of type cls; otherwise returns false.
+	public boolean entailedType(Resource subject, OntClass cls) {
+		
+		log.debug("subject = " + subject.getURI() + " class = " + cls.getURI());
+		
+		aboxModel.enterCriticalSection(Lock.READ);
+		tboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			ExtendedIterator<OntClass> iter = cls.listSubClasses(false);
+			while (iter.hasNext()) {
+				
+				OntClass childClass = iter.next();
+				Statement stmt = ResourceFactory.createStatement(subject, RDF.type, childClass);
+				if (aboxModel.contains(stmt)) return true;
+			}
+			
+			return false;
+		} finally {
+			aboxModel.leaveCriticalSection();
+			tboxModel.leaveCriticalSection();
+		}	
+	}
+	
+	/*
+	 * If added that B is a subclass of A, then find all individuals
+	 * that are typed as B, either in the ABox or in the inferred model
+	 * and assert that they are of type A.
+	 */
+	public void addedSubClass(OntClass subClass, OntClass superClass) {
+		
+		log.debug("subClass = " + subClass.getURI() + " superClass = " + superClass.getURI());
+		
+		aboxModel.enterCriticalSection(Lock.READ);
+		inferenceModel.enterCriticalSection(Lock.WRITE);
+		
+		try {
+			OntModel unionModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+			unionModel.add(aboxModel);
+			unionModel.add(inferenceModel);
+					
+			StmtIterator iter = unionModel.listStatements((Resource) null, RDF.type, subClass);
+	
+			while (iter.hasNext()) {
+				
+				Statement stmt = iter.next();
+				Resource ind = unionModel.getResource(stmt.getSubject().getURI());
+				Statement infStmt = ResourceFactory.createStatement(ind, RDF.type, superClass);
+				
+				inferenceModel.enterCriticalSection(Lock.WRITE);
+				
+				if (!inferenceModel.contains(infStmt)) {
+					log.debug("Adding this inferred statement:  " + infStmt.toString() );
+					inferenceModel.add(infStmt);
+				} 
+			}
+		} finally {
+			aboxModel.leaveCriticalSection();
+			inferenceModel.leaveCriticalSection();
+		}
+	}
+	
+	/*
+	 * If removed that B is a subclass of A, then for each individual
+	 * that is of type B, either inferred or in the ABox, then
+	 * remove the inferred assertion that it is of type A,
+	 * UNLESS the individual is of some type C that is 
+	 * a subClass of A (including A itself)
+	 * 
+	 */
+	public void removedSubClass(OntClass subClass, OntClass superClass) {
+		
+		log.debug("subClass = " + subClass.getURI() + ". superClass = " + superClass.getURI());
+
+		aboxModel.enterCriticalSection(Lock.READ);
+		inferenceModel.enterCriticalSection(Lock.WRITE);
+		
+		try {
+			OntModel unionModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+			unionModel.add(aboxModel);
+			unionModel.add(inferenceModel);
+					
+			StmtIterator iter = unionModel.listStatements((Resource) null, RDF.type, subClass);
+	
+			while (iter.hasNext()) {
+				
+				Statement stmt = iter.next();
+				Resource ind = unionModel.getResource(stmt.getSubject().getURI());
+				
+				if (entailedType(ind,superClass)) continue;
+				
+				Statement infStmt = ResourceFactory.createStatement(ind, RDF.type, superClass);
+				
+				inferenceModel.enterCriticalSection(Lock.WRITE);
+				
+				if (inferenceModel.contains(infStmt)) {
+					log.debug("Removing this inferred statement:  " + infStmt.toString() );
+					inferenceModel.remove(infStmt);
+				} 
+			}
+		} finally {
+			aboxModel.leaveCriticalSection();
+			inferenceModel.leaveCriticalSection();
+		}
+	}
+
+	/*
+	 * Recompute the entire ABox inference graph. The new 
+	 * inference graph is built up in a separate model and
+	 * then reconciled with the inference graph used by the
+	 * application. The model reconciliation must be done
+	 * without reading the whole inference models into 
+	 * memory since we are supporting very large ABox 
+	 * inference models.	  
+	 */
+	public void recompute(OntClass subClass, OntClass superClass) {
+	
+		// recompute the inferences 
+		inferenceRebuildModel.enterCriticalSection(Lock.WRITE);	
+		aboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			inferenceRebuildModel.removeAll();
+			StmtIterator iter = aboxModel.listStatements((Resource) null, RDF.type, (RDFNode) null);
+			
+			while (iter.hasNext()) {				
+				Statement stmt = iter.next();
+				addedType(stmt, inferenceRebuildModel);
+			}
+		} catch (Exception e) {
+			 log.error("Exception while recomputing ABox inference model", e);
+		} finally {
+			aboxModel.leaveCriticalSection();
+			inferenceRebuildModel.leaveCriticalSection();
+		}			
+		
+		
+		// reflect the recomputed inferences into the application inference
+		// model.
+		inferenceRebuildModel.enterCriticalSection(Lock.READ);
+		scratchpadModel.enterCriticalSection(Lock.WRITE);
+		
+		try {
+			// Remove everything from the current inference model that is not
+			// in the recomputed inference model		
+			inferenceModel.enterCriticalSection(Lock.READ);
+			
+			try {
+				scratchpadModel.removeAll();
+				StmtIterator iter = inferenceModel.listStatements();
+				
+				while (iter.hasNext()) {				
+					Statement stmt = iter.next();
+					if (!inferenceRebuildModel.contains(stmt)) {
+					   scratchpadModel.add(stmt);
+					}
+				}
+			} catch (Exception e) {
+				log.error("Exception while reconciling the current and recomputed ABox inference models", e);
+			} finally {
+	            inferenceModel.leaveCriticalSection();
+			}
+			
+			inferenceModel.enterCriticalSection(Lock.WRITE);
+			try {
+				inferenceModel.remove(scratchpadModel);
+			} catch (Exception e){
+				log.error("Exception while reconciling the current and recomputed ABox inference models", e);
+			} finally {
+				inferenceModel.leaveCriticalSection();
+			}
+			
+			// Add everything from the recomputed inference model that is not already
+			// in the current inference model to the current inference model.
+			inferenceModel.enterCriticalSection(Lock.READ);
+			
+			try {
+				scratchpadModel.removeAll();
+				StmtIterator iter = inferenceRebuildModel.listStatements();
+				
+				while (iter.hasNext()) {				
+					Statement stmt = iter.next();
+					if (!inferenceModel.contains(stmt)) {
+					   scratchpadModel.add(stmt);
+					}
+				}
+			} catch (Exception e) {		
+				log.error("Exception while reconciling the current and recomputed ABox inference models", e);
+			} finally {
+				inferenceModel.leaveCriticalSection();			
+			}
+			
+			inferenceModel.enterCriticalSection(Lock.WRITE);
+			try {
+				inferenceModel.add(scratchpadModel);
+			} catch (Exception e){
+				log.error("Exception while reconciling the current and recomputed ABox inference models", e);
+			} finally {
+				inferenceModel.leaveCriticalSection();
+			}
+		} finally {
+			inferenceRebuildModel.leaveCriticalSection();
+			scratchpadModel.leaveCriticalSection();			
+		}
+	}
+		
+	// The following three methods aren't currently called; the default behavior of VIVO is to not materialize such inferences.
+	public void addedProperty(Statement stmt) {
+
+		tboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			OntProperty prop = tboxModel.getOntProperty(stmt.getPredicate().getURI());
+			
+			if (prop != null) {	
+				ExtendedIterator<? extends OntProperty> superIt = prop.listSuperProperties(false);
+			
+				while (superIt.hasNext()) {
+					OntProperty parentProp = superIt.next();
+					Statement infStmt = ResourceFactory.createStatement(stmt.getSubject(), parentProp, stmt.getObject());
+					inferenceModel.enterCriticalSection(Lock.WRITE);
+					try {
+						if (!inferenceModel.contains(infStmt)) {
+							log.debug("Adding inferred statement: " + infStmt.toString() + " - " + infStmt.getSubject().toString() + " - " + infStmt.getPredicate().toString() + " - " + infStmt.getObject().toString());
+							inferenceModel.add(infStmt);
+						}
+					} finally {
+						inferenceModel.leaveCriticalSection();
+					}
+				}
+				
+			} else {
+				log.debug("Didn't find predicate of the added statement in the TBox: " + stmt.getPredicate().getURI());
+			}
+		} finally {
+			tboxModel.leaveCriticalSection();
+		}
+	}
+	
+	public void removedProperty(Statement stmt) {
+		
+		tboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			OntProperty prop = tboxModel.getOntProperty(stmt.getPredicate().getURI());
+			
+			if (prop != null) {	
+				ExtendedIterator<? extends OntProperty> superIt = prop.listSuperProperties(false);
+			
+				while (superIt.hasNext()) {
+					OntProperty parentProp = superIt.next();
+					
+					if (entailedStmt(stmt.getSubject(),parentProp,stmt.getObject() )) continue;    // if the statement is still entailed 
+					                                                                           // don't remove it from the inference graph.
+                                                                                
+					Statement infStmt = ResourceFactory.createStatement(stmt.getSubject(), parentProp, stmt.getObject());
+					
+					inferenceModel.enterCriticalSection(Lock.WRITE);
+					try {
+						if (inferenceModel.contains(infStmt)) {
+							log.debug("Removing inferred statement: " + infStmt.toString() + " - " + infStmt.getSubject().toString() + " - " + infStmt.getPredicate().toString() + " - " + infStmt.getObject().toString());
+							inferenceModel.remove(infStmt);
+						}
+					} finally {
+						inferenceModel.leaveCriticalSection();
+					}
+				}
+				
+			} else {
+				log.debug("Didn't find predicate of the removed statement in the TBox: " + stmt.getPredicate().getURI());
+			}
+		} finally {
+			tboxModel.leaveCriticalSection();
+		}	
+	}
+	
+	// Returns true if the statement is entailed by property subsumption 
+	public boolean entailedStmt(Resource subject, OntProperty prop, RDFNode object) {
+		
+		aboxModel.enterCriticalSection(Lock.READ);
+		
+		try {
+			
+			ExtendedIterator<? extends OntProperty> iter = prop.listSubProperties(false);
+			
+			while (iter.hasNext()) {
+				
+				OntProperty childProp = iter.next();
+				
+				Statement stmt = ResourceFactory.createStatement(subject, childProp, object);
+				if (aboxModel.contains(stmt)) return true;
+			}
+			
+			return false;
+		} finally {
+			aboxModel.leaveCriticalSection();
+		}	
+	}
+  }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/support/SimpleReasonerTBoxListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/support/SimpleReasonerTBoxListener.java
new file mode 100644
index 000000000..338268646
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/reasoner/support/SimpleReasonerTBoxListener.java
@@ -0,0 +1,39 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.reasoner.support;
+
+import com.hp.hpl.jena.rdf.listeners.StatementListener;
+import com.hp.hpl.jena.rdf.model.Statement;
+
+import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
+
+/**
+ * Route notification of changes to TBox to the incremental ABox reasoner.
+ * The incremental ABox reasoner needs to handle only subclass, superclass
+ * and equivalent class axioms.
+ *  
+ */
+
+public class SimpleReasonerTBoxListener extends StatementListener {
+
+	private SimpleReasoner simpleReasoner = null;
+
+
+	public SimpleReasonerTBoxListener(SimpleReasoner simpleReasoner) {
+		this.simpleReasoner = simpleReasoner;
+	}
+	
+	@Override
+	public void addedStatement(Statement stmt) {
+		
+		simpleReasoner.addedTBoxStatement(stmt);
+
+	}
+	
+	@Override
+	public void removedStatement(Statement stmt) {
+	
+		simpleReasoner.removedTBoxStatement(stmt);
+	}
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AttachSubmodels.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AttachSubmodels.java
index 2056b1460..a93ea25ba 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AttachSubmodels.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AttachSubmodels.java
@@ -53,10 +53,11 @@ public class AttachSubmodels implements ServletContextListener {
 						attachmentCount++;
 						log.info("Attached submodel from file " + p);
 					} catch (Exception ioe) {
-						fis.close();
 						log.error("Unable to attach submodel from file " + p, ioe);
 						System.out.println("Unable to attach submodel from file " + p);
 						ioe.printStackTrace();
+					} finally {
+						fis.close();
 					}
 				} catch (FileNotFoundException fnfe) {
 					log.warn(p + " not found. Unable to attach as submodel" + 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
new file mode 100644
index 000000000..ed49b5a2f
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -0,0 +1,233 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet.setup;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.sdb.SDBFactory;
+import com.hp.hpl.jena.sdb.Store;
+import com.hp.hpl.jena.sdb.util.StoreUtils;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelectorImpl;
+
+// This ContextListener must run after the JenaDataSourceSetup ContextListener
+
+public class FileGraphSetup implements ServletContextListener {
+
+	private static String ABOX = "abox";
+	private static String TBOX = "tbox";
+	private static String PATH_ROOT = "/WEB-INF/filegraph/";
+	private static String URI_ROOT = "http://vitro.mannlib.cornell.edu/filegraph/";
+	
+	private static final Log log = LogFactory.getLog(FileGraphSetup.class);
+		
+	public void contextInitialized(ServletContextEvent sce) {
+		
+		try {
+			OntModelSelectorImpl baseOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("baseOntModelSelector");
+			Store kbStore = (Store) sce.getServletContext().getAttribute("kbStore");
+			
+			// ABox files
+			Set<String> pathSet = sce.getServletContext().getResourcePaths(PATH_ROOT + ABOX);
+			
+			cleanupDB(kbStore, pathToURI(pathSet, ABOX), ABOX);
+			
+			if (pathSet != null) {
+ 			   OntModel aboxBaseModel = baseOms.getABoxModel();
+			   readGraphs(sce, pathSet, kbStore, ABOX, aboxBaseModel);		
+			}
+			
+			// TBox files
+			pathSet = sce.getServletContext().getResourcePaths(PATH_ROOT + TBOX);
+			
+			cleanupDB(kbStore, pathToURI(pathSet, TBOX),TBOX);
+			
+			if (pathSet != null) {
+			   OntModel tboxBaseModel = baseOms.getTBoxModel();
+			   readGraphs(sce, pathSet, kbStore, TBOX, tboxBaseModel);
+			}
+		} catch (ClassCastException cce) {
+			String errMsg = "Unable to cast servlet context attribute to the appropriate type " + cce.getLocalizedMessage();
+			log.error(errMsg);
+			throw new ClassCastException(errMsg);
+		} catch (Throwable t) {
+			System.out.println("Throwable in listener " + this.getClass().getName());
+			log.error(t);
+			t.printStackTrace();
+		}
+	}
+	
+	/*
+	 * Reads the graphs stored as files in sub-directories of 
+	 * FileGraphSetup.PATH_ROOT and for each graph:
+	 *   1. updates the SDB store to reflect the current contents of the graph.
+	 *   2. adds the graph as an in-memory submodel of the base in-memory graph 
+	 *      
+	 * Note: no connection needs to be maintained between the in-memory copy of the
+	 * graph and the DB copy.
+	 */
+	public void readGraphs(ServletContextEvent sce, Set<String> pathSet, Store kbStore, String type, OntModel baseModel) {
+			
+		int count = 0;
+		
+		// For each file graph in the target directory update or add that graph to
+		// the Jena SDB, and attach the graph as a submodel of the base model
+		for ( String p : pathSet ) {
+
+			count++; // note this will count the empty files too
+			File file = new File(sce.getServletContext().getRealPath(p));
+			
+			try {
+				FileInputStream fis = new FileInputStream( file );
+				try {
+					Model model = ModelFactory.createDefaultModel(); 
+					if ( p.endsWith(".n3") || p.endsWith(".N3") || p.endsWith(".ttl") || p.endsWith(".TTL") ) {
+						model.read( fis, null, "N3" );
+					} else if ( p.endsWith(".owl") || p.endsWith(".OWL") || p.endsWith(".rdf") || p.endsWith(".RDF") || p.endsWith(".xml") || p.endsWith(".XML") ) {
+						model.read( fis, null, "RDF/XML" );
+					} else {
+						log.warn("Ignoring " + type + " file graph " + p + " because the file extension is unrecognized.");
+					}
+					
+					if ( !model.isEmpty() ) {							
+						 baseModel.addSubModel(model);
+						 log.info("Attached file graph as " + type + " submodel " + p);
+					} 
+					
+					updateGraphInDB(kbStore, model, type, p);
+					
+				} catch (Exception ioe) {
+					log.error("Unable to process file graph " + p, ioe);
+					System.out.println("Unable to process file graph " + p);
+					ioe.printStackTrace();
+				} finally {
+					fis.close();
+				}
+			} catch (FileNotFoundException fnfe) {
+				log.warn(p + " not found. Unable to process file graph" + 
+						((fnfe.getLocalizedMessage() != null) ? 
+						fnfe.getLocalizedMessage() : "") );
+			} catch (IOException ioe) {
+				// this is for the fis.close() above.
+				log.warn("Exception while trying to close file graph file: " + p,ioe);
+			}
+		} // end - for
+		
+		System.out.println("Read " + count + " "  + type + " file graph" + ((count == 1) ? "" : "s") + " from " + PATH_ROOT + type);
+		
+		return;
+	}
+	
+	/*
+	 * If a graph with the given name doesn't exist in the DB then add it.
+     *
+	 * Otherwise, if a graph with the given name is in the DB and is not isomorphic with
+	 * the graph that was read from the file system then replace the graph
+	 * in the DB with the one read from the file system.
+	 * 
+	 * Otherwise, if a graph with the given name is in the DB and is isomorphic with
+	 * the graph that was read from the files system, then do nothing. 
+	 */
+	public void updateGraphInDB(Store kbStore, Model fileModel, String type, String path) {
+			
+		String graphURI = pathToURI(path,type);
+		Model dbModel = SDBFactory.connectNamedModel(kbStore, graphURI);
+		
+		if (dbModel.isEmpty() ) {
+			dbModel.add(fileModel);
+		} else if (!dbModel.isIsomorphicWith(fileModel)) {
+		    dbModel.removeAll();
+		    dbModel.add(fileModel);
+		}
+		
+		return;
+	}
+	
+	/*
+	 * Deletes any file graphs that are  no longer present in the file system
+	 * from the DB. 
+	 * 
+	 * @param uriSet (input)   - a set of graph URIs representing the file
+	 *                           graphs (of the given type) in the file
+	 *                           system.
+	 * @param type (input)     - abox or tbox.
+	 * @param kbStore (output) - the SDB store for the application                        
+	 */
+	public void cleanupDB(Store kbStore, Set<String> uriSet, String type) {
+		
+		Pattern graphURIPat = Pattern.compile("^" + URI_ROOT + type);   
+		 
+	    Iterator<Node> iter = StoreUtils.storeGraphNames(kbStore);	
+	    
+	    while (iter.hasNext()) {
+	    	Node node = iter.next();
+            Matcher matcher = graphURIPat.matcher(node.getURI());
+		    
+            if (matcher.find()) {
+		    	if (!uriSet.contains(node.getURI())) {
+		    		 Model model = SDBFactory.connectNamedModel(kbStore, node.getURI());
+		    		 model.removeAll(); // delete the graph from the DB
+					 log.info("Removed " + type + " file graph " + node.getURI() + " from the DB store because the file no longer exists in the file system");
+		    	}
+            }            
+	    }
+	
+		return;
+	}
+		
+	/*
+	 * Takes a set of path names for file graphs and returns a set containing
+	 * a graph uri for each path name in the input set. If pathSet is null
+	 * returns an empty set.
+	 */
+	public Set<String> pathToURI (Set<String> pathSet, String type) {
+		
+		HashSet<String> uriSet = new HashSet<String>();
+		
+	    if (pathSet != null) {
+			for ( String path : pathSet ) {
+				uriSet.add(pathToURI(path,type));
+			}
+	    }
+		
+		return uriSet;
+	}
+
+	/*
+	 * Takes a path name for a file graph and returns the corresponding SDB URI
+	 * for the graph. The correspondence is by defined convention.
+	 */
+	public String pathToURI(String path, String type) {
+	
+		String uri = null;
+		
+	    if (path != null) {
+	    	File file = new File(path);
+			uri = URI_ROOT + type + "/" + file.getName(); 
+	    }
+		
+		return uri;
+	}
+
+	public void contextDestroyed( ServletContextEvent sce ) {
+		// nothing to do
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java
index 844f8a2c6..216249a08 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetup.java
@@ -84,6 +84,7 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java
             sce.getServletContext().setAttribute("jenaOntModel", unionModel);  
             WebappDaoFactory wadf = new WebappDaoFactoryJena(unionOms, defaultNamespace, null, null);
             sce.getServletContext().setAttribute("webappDaoFactory",wadf);
+            sce.getServletContext().setAttribute("unionOntModelSelector", unionOms);
             
             ApplicationBean appBean = getApplicationBeanFromOntModel(memModel,wadf);
             if (appBean != null) {
@@ -262,3 +263,4 @@ public class JenaDataSourceSetup extends JenaDataSourceSetupBase implements java
     }
     
 }
+
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
index 862963f37..68e679c5b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
@@ -16,19 +16,23 @@ import com.hp.hpl.jena.ontology.OntModelSpec;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.sdb.StoreDesc;
+import com.hp.hpl.jena.sdb.store.DatabaseType;
+import com.hp.hpl.jena.sdb.store.LayoutType;
 
 import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDaoCon;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RegeneratingGraph;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.SDBGraphGenerator;
 
 public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
     private static final Log log = LogFactory.getLog(JenaDataSourceSetupBase.class);
 
     protected final static int DEFAULT_MAXWAIT = 10000, // ms
-            DEFAULT_MAXACTIVE = 40,
-            DEFAULT_MAXIDLE = 10,
+            DEFAULT_MAXACTIVE = 300,
+            DEFAULT_MAXIDLE = 84,
             DEFAULT_TIMEBETWEENEVICTIONS = 30 * 60 * 1000, // ms
             DEFAULT_TESTSPEREVICTION = 3,
             DEFAULT_MINEVICTIONIDLETIME = 1000 * 60 * 30; // ms
@@ -47,11 +51,42 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
    String DB_PASSWD = "jenatest";                          // database password
    String DB =        "MySQL";                             // database type
    String DB_DRIVER_CLASS_NAME = "com.mysql.jdbc.Driver";
+     
+   // ABox assertions. These are stored in a database (Jena SDB) and the application works 
+   // (queries and updates) with the ABox data from the DB - this model is not maintained
+   // in memory. For query performance reasons, there won't be any submodels for the ABox data.
+   
    static final String JENA_DB_MODEL = "http://vitro.mannlib.cornell.edu/default/vitro-kb-2";
-   static final String JENA_AUDIT_MODEL = "http://vitro.mannlib.cornell.edu/ns/db/experimental/audit";
+   
+   // ABox inferences. This is ABox data that is inferred, using VIVO's native simple, specific-
+   // purpose reasoning based on the combination of the Abox (assertion and inferences) data 
+   // and the TBox (assertions and inferences) data.
    static final String JENA_INF_MODEL = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf";
+      
+   // TBox assertions. 
+   // Some of these (the local extensions) are stored and maintained in a Jena database and
+   // are also maintained in memory while the application is running. 
+   // Other parts of the TBox, the 'VIVO Core', are also backed by a Jena DB, but they are 
+   // read fresh from files each time the application starts. While the application is running,
+   // they are kept in memory, as submodels of the in memory copy of this named graph. 
+   static final String JENA_TBOX_ASSERTIONS_MODEL = "http://vitro.mannlib.cornell.edu/default/asserted-tbox";
+
+   
+   // Inferred TBox. This is TBox data that is inferred from the combination of VIVO core TBox
+   // and any local extension TBox assertions. Pellet computes these inferences.
+   // These are stored in the DB.
+   static final String JENA_TBOX_INF_MODEL = "http://vitro.mannlib.cornell.edu/default/inferred-tbox";
+   
+   static final String JENA_AUDIT_MODEL = "http://vitro.mannlib.cornell.edu/ns/db/experimental/audit";
+
    static final String JENA_USER_ACCOUNTS_MODEL = "http://vitro.mannlib.cornell.edu/default/vitro-kb-userAccounts";
+   
+   // This model doesn't exist yet. It's a placeholder for the application ontology.
+   
    static final String JENA_APPLICATION_METADATA_MODEL = "http://vitro.mannlib.cornell.edu/default/vitro-kb-applicationMetadata";
+   
+   // This is Brian C's application.owl file. We may not have to be concerned with this for 
+   // release 1.2.
    static final String JENA_DISPLAY_METADATA_MODEL = "http://vitro.mannlib.cornell.edu/default/vitro-kb-displayMetadata";
 
    static final String DEFAULT_DEFAULT_NAMESPACE = "http://vitro.mannlib.cornell.edu/ns/default#";
@@ -79,6 +114,30 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
        jenaDbOntModelSpec = (jenaDbOntModelSpec != null) ? jenaDbOntModelSpec : DB_ONT_MODEL_SPEC;
        return makeDBModel(ds, jenaDbModelName, jenaDbOntModelSpec);
    }
+   
+   /**
+    * Sets up a BasicDataSource using values from
+    * a properties file.
+    */
+   public final BasicDataSource makeDataSourceFromConfigurationProperties(){
+       String dbDriverClassname = ConfigurationProperties.getProperty("VitroConnection.DataSource.driver", DB_DRIVER_CLASS_NAME);
+       String jdbcUrl = ConfigurationProperties.getProperty("VitroConnection.DataSource.url") + "?useUnicode=yes&characterEncoding=utf8";
+       String username = ConfigurationProperties.getProperty("VitroConnection.DataSource.username");
+       String password = ConfigurationProperties.getProperty("VitroConnection.DataSource.password");
+       return makeBasicDataSource(dbDriverClassname, jdbcUrl, username, password);
+   }
+   
+   public void setApplicationDataSource(BasicDataSource bds, ServletContext ctx) {
+	   ctx.setAttribute(getDataSourceAttributeName(), bds);
+   }
+   
+   public static BasicDataSource getApplicationDataSource(ServletContext ctx) {
+	   return (BasicDataSource) ctx.getAttribute(getDataSourceAttributeName());
+   }
+   
+   private static String getDataSourceAttributeName() {
+	   return JenaDataSourceSetupBase.class.getName() + ".dataSource";
+   }
 
    public static BasicDataSource makeBasicDataSource(String dbDriverClassname, String jdbcUrl, String username, String password) {
        log.debug("makeBasicDataSource('" + dbDriverClassname + "', '"
@@ -107,19 +166,29 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
        return ds;
    }
    
-   private Model makeDBModel(BasicDataSource ds, String jenaDbModelName, OntModelSpec jenaDbOntModelSpec) {
+   public enum TripleStoreType {
+	   RDB, SDB
+   }
+   
+   protected Model makeDBModel(BasicDataSource ds, String jenaDbModelname, OntModelSpec jenaDbOntModelSpec) {
+	   return makeDBModel(ds, jenaDbModelname, jenaDbOntModelSpec, TripleStoreType.RDB);
+   }
+   
+   protected Model makeDBModel(BasicDataSource ds, String jenaDbModelName, OntModelSpec jenaDbOntModelSpec, TripleStoreType storeType) {
        Model dbModel = null;
        try {
            //  open the db model
             try {
-                Graph g = new RegeneratingGraph(new RDBGraphGenerator(ds, DB, jenaDbModelName));
-                Model m = ModelFactory.createModelForGraph(g);
-                dbModel = m;
-                //dbModel = ModelFactory.createOntologyModel(jenaDbOntModelSpec,m);
-               
-               //Graph g = maker.openGraph(JENA_DB_MODEL,false);
-               //dbModel = ModelFactory.createModelForGraph(g);
-               //maker.openModel(JENA_DB_MODEL);
+                Graph g = null;
+                switch (storeType) {
+                	case RDB:
+                		g = new RegeneratingGraph(new RDBGraphGenerator(ds, DB, jenaDbModelName)); break;
+                	case SDB:
+                		StoreDesc desc = new StoreDesc(LayoutType.LayoutTripleNodesHash, DatabaseType.MySQL);
+                    	g = new RegeneratingGraph(new SDBGraphGenerator(ds, desc, jenaDbModelName)); break;
+                	default: throw new RuntimeException ("Unsupported store type " + storeType); 
+                }
+                dbModel = ModelFactory.createModelForGraph(g);
                 log.debug("Using database at "+ds.getUrl());
             } catch (Throwable t) {
                 t.printStackTrace();
@@ -127,7 +196,6 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
        } catch (Throwable t) {
            t.printStackTrace();
        }
-
        return dbModel;
    }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
new file mode 100644
index 000000000..53701c6a2
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupSDB.java
@@ -0,0 +1,415 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet.setup;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.Individual;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.sdb.SDBFactory;
+import com.hp.hpl.jena.sdb.Store;
+import com.hp.hpl.jena.sdb.StoreDesc;
+import com.hp.hpl.jena.sdb.sql.SDBConnection;
+import com.hp.hpl.jena.sdb.store.DatabaseType;
+import com.hp.hpl.jena.sdb.store.DatasetStore;
+import com.hp.hpl.jena.sdb.store.LayoutType;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDaoCon;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelectorImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
+import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapper;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.InitialJenaModelUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.NamespaceMapperJena;
+
+public class JenaDataSourceSetupSDB extends JenaDataSourceSetupBase implements javax.servlet.ServletContextListener {
+	
+	private static final Log log = LogFactory.getLog(JenaDataSourceSetup.class.getName());
+	
+    public void contextInitialized(ServletContextEvent sce) {
+        try {
+
+        	// JenaPersistentDataSourceSetup should have already set this up - it just sets
+        	// up things related to the DB.
+        	// TODO: I would like to make this code (before the sdb try/catch conditional so
+        	// that it is not executed in a post-sdb-conversion environment.
+            OntModel memModel = (OntModel) sce.getServletContext().getAttribute("jenaOntModel");
+            if (memModel == null) {
+            	memModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+            	log.warn("WARNING: no database connected.  Changes will disappear after context restart.");
+            	sce.getServletContext().setAttribute("jenaOntModel",memModel);
+            }            
+            memModel.addSubModel((new JenaBaseDaoCon()).getConstModel()); // add the vitro tbox to the model
+            
+            OntModel inferenceModel = ontModelFromContextAttribute(sce.getServletContext(), "inferenceOntModel");
+            
+            OntModel userAccountsModel = ontModelFromContextAttribute(sce.getServletContext(), "userAccountsOntModel");            
+            if (userAccountsModel.size() == 0) {
+        		checkMainModelForUserAccounts(memModel, userAccountsModel);
+        	}
+            
+            OntModel unionModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC,ModelFactory.createUnion(memModel, inferenceModel));
+
+            OntModelSelectorImpl baseOms = new OntModelSelectorImpl();
+            baseOms.setApplicationMetadataModel(memModel);
+            baseOms.setTBoxModel(memModel);
+            baseOms.setFullModel(memModel);
+            OntModelSelectorImpl inferenceOms = new OntModelSelectorImpl();
+            inferenceOms.setABoxModel(inferenceModel);
+            inferenceOms.setTBoxModel(inferenceModel);
+            inferenceOms.setFullModel(inferenceModel);
+            OntModelSelectorImpl unionOms = new OntModelSelectorImpl();
+            unionOms.setApplicationMetadataModel(unionModel);
+            unionOms.setTBoxModel(unionModel);
+            unionOms.setFullModel(unionModel);
+        	baseOms.setUserAccountsModel(userAccountsModel);
+        	inferenceOms.setUserAccountsModel(userAccountsModel);
+        	unionOms.setUserAccountsModel(userAccountsModel);       
+            
+        	OntModel displayModel = ontModelFromContextAttribute(sce.getServletContext(),"displayOntModel");
+        	baseOms.setDisplayModel(displayModel);
+        	inferenceOms.setDisplayModel(displayModel);
+        	unionOms.setDisplayModel(displayModel);
+        			
+        	checkForNamespaceMismatch( memModel, defaultNamespace );
+
+        	// SDB initialization
+			StoreDesc storeDesc = new StoreDesc(LayoutType.LayoutTripleNodesHash, DatabaseType.MySQL) ;
+			sce.getServletContext().setAttribute("storeDesc", storeDesc);
+			BasicDataSource bds = makeDataSourceFromConfigurationProperties();
+        	this.setApplicationDataSource(bds, sce.getServletContext());
+        	SDBConnection conn = new SDBConnection(bds.getConnection()) ; 
+        	Store store = SDBFactory.connectStore(conn, storeDesc);
+        	try {
+        		// a test query to see if the store is formatted
+        		SDBFactory.connectDefaultModel(store).contains(OWL.Thing, RDF.type, OWL.Nothing); 
+        	} catch (Exception e) { // unformatted store
+        		log.debug("Non-SDB system detected. Setting up SDB store");
+    			store.getTableFormatter().create();
+            	store.getTableFormatter().truncate();
+            	
+            	// This is a one-time copy of stored KB data - from a Jena RDB store
+            	// to a Jena SDB store. In the process, we will also separate out the
+            	// TBox from the Abox; these are in the same graph in pre 1.2 VIVO 
+            	// versions and will now be stored and maintained in separate models
+            	// Access to the Jena RDB data is through the OntModelSelectors that have
+            	// been set up earlier in the current session by
+            	// JenaPersistentDataSourceSetup.java
+            	// In the code below, note that the current getABoxModel() methods on 
+            	// the OntModelSelectors return a graph with both ABox and TBox data.
+            	
+            	JenaModelUtils modelUtils = new JenaModelUtils();
+            	
+            	Model aboxAssertions = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_DB_MODEL);
+            	aboxAssertions.add(modelUtils.extractABox(baseOms.getABoxModel()));
+            
+            	Model aboxInferences = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_INF_MODEL);
+            	aboxInferences.add(modelUtils.extractABox(inferenceOms.getABoxModel()));
+            	
+            	Model tboxAssertions = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL);
+            	tboxAssertions.add(modelUtils.extractTBox(baseOms.getABoxModel()));
+            	
+            	Model tboxInferences = SDBFactory.connectNamedModel(store, JenaDataSourceSetupBase.JENA_TBOX_INF_MODEL);
+            	tboxInferences.add(modelUtils.extractTBox(inferenceOms.getABoxModel())); 
+            	            	 
+            	// The code below, which sets up the OntModelSelectors, controls whether each
+            	// model is maintained in memory, in the DB, or both, while the application
+            	// is running.
+        	}
+
+        	
+            sce.getServletContext().setAttribute("kbStore", store);
+            
+            //store.getTableFormatter().dropIndexes();
+            //store.getTableFormatter().addIndexes();
+        	       	
+        	// Populate the three OntModelSelectors (BaseOntModel=assertions, InferenceOntModel=inferences
+        	// and JenaOntModel=union of assertions and inferences) with the post-SDB-conversion models.
+ 
+        	// ABox assertions
+        	Model aboxAssertions = makeDBModel(bds, JenaDataSourceSetupBase.JENA_DB_MODEL, DB_ONT_MODEL_SPEC, TripleStoreType.SDB);
+        	Model listenableAboxAssertions = ModelFactory.createUnion(aboxAssertions, ModelFactory.createDefaultModel());
+        	baseOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, listenableAboxAssertions));
+        	
+        	// ABox inferences
+        	Model aboxInferences = makeDBModel(bds, JenaDataSourceSetupBase.JENA_INF_MODEL, DB_ONT_MODEL_SPEC, TripleStoreType.SDB);
+        	Model listenableAboxInferences = ModelFactory.createUnion(aboxInferences, ModelFactory.createDefaultModel());
+        	inferenceOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, listenableAboxInferences));
+
+        	
+        	// Since the TBox models are in memory, they do not have time out issues like the
+        	// ABox models do (and so don't need the extra step to make them listenable).
+        	// TBox assertions
+            try {
+            	Model tboxAssertionsDB = makeDBModel(bds, JENA_TBOX_ASSERTIONS_MODEL, DB_ONT_MODEL_SPEC, TripleStoreType.SDB);
+            	OntModel tboxAssertions = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+            	
+            	if (tboxAssertionsDB != null) {
+            		long startTime = System.currentTimeMillis();
+            		System.out.println("Copying cached tbox assertions into memory");
+            		tboxAssertions.add(tboxAssertionsDB);
+            		System.out.println((System.currentTimeMillis()-startTime)/1000+" seconds to load tbox assertions");
+            	}
+
+            	tboxAssertions.getBaseModel().register(new ModelSynchronizer(tboxAssertionsDB));
+                baseOms.setTBoxModel(tboxAssertions);
+            } catch (Throwable e) {
+            	log.error("Unable to load tbox assertion cache from DB", e);
+            }
+        	
+        	// TBox inferences
+            try {
+            	Model tboxInferencesDB = makeDBModel(bds, JENA_TBOX_INF_MODEL, DB_ONT_MODEL_SPEC, TripleStoreType.SDB);
+            	OntModel tboxInferences = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+            	
+            	if (tboxInferencesDB != null) {
+            		long startTime = System.currentTimeMillis();
+            		System.out.println("Copying cached tbox inferences into memory");
+            		tboxInferences.add(tboxInferencesDB);
+            		System.out.println((System.currentTimeMillis()-startTime)/1000+" seconds to load tbox inferences");
+            	}
+            	
+            	tboxInferences.getBaseModel().register(new ModelSynchronizer(tboxInferencesDB));
+                inferenceOms.setTBoxModel(tboxInferences);
+            } catch (Throwable e) {
+            	log.error("Unable to load tbox inference cache from DB", e);
+            }
+            
+        	// union ABox
+            OntModel unionABoxModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC,ModelFactory.createUnion(baseOms.getABoxModel(), inferenceOms.getABoxModel()));
+            unionOms.setABoxModel(unionABoxModel);
+            
+        	// union TBox
+            OntModel unionTBoxModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC,ModelFactory.createUnion(baseOms.getTBoxModel(), inferenceOms.getTBoxModel()));      	
+        	unionOms.setTBoxModel(unionTBoxModel);
+            
+        	Dataset dataset = DatasetStore.create(store);
+        	//String queryStr = "CONSTRUCT { ?s ?p ?o } \n" +
+        	//                  "WHERE { GRAPH ?g { ?s ?p ?o } } ";
+        	//Query query = QueryFactory.create(queryStr);
+        	//QueryExecution qe = QueryExecutionFactory.create(query, dataset);
+        	//log.info("Test query returned " + qe.execConstruct().size() + " statements");
+        	
+            sce.getServletContext().setAttribute("baseOntModel", memModel);
+            WebappDaoFactory baseWadf = new WebappDaoFactorySDB(baseOms, dataset, defaultNamespace, null, null);
+            //WebappDaoFactory baseWadf = new WebappDaoFactoryJena(baseOms, defaultNamespace, null, null);
+            sce.getServletContext().setAttribute("assertionsWebappDaoFactory",baseWadf);
+            
+            sce.getServletContext().setAttribute("inferenceOntModel", inferenceModel);
+            WebappDaoFactory infWadf = new WebappDaoFactorySDB(inferenceOms, dataset, defaultNamespace, null, null);
+            //WebappDaoFactory infWadf = new WebappDaoFactoryJena(inferenceOms, defaultNamespace, null, null);
+            sce.getServletContext().setAttribute("deductionsWebappDaoFactory", infWadf);
+            
+            sce.getServletContext().setAttribute("jenaOntModel", unionModel);  
+            WebappDaoFactory wadf = new WebappDaoFactorySDB(unionOms, dataset, defaultNamespace, null, null);
+            //WebappDaoFactory wadf = new WebappDaoFactoryJena(unionOms, defaultNamespace, null, null);
+            sce.getServletContext().setAttribute("webappDaoFactory",wadf);
+            
+            sce.getServletContext().setAttribute("unionOntModelSelector", unionOms);          //assertions and inferences
+            sce.getServletContext().setAttribute("baseOntModelSelector", baseOms);            //assertions
+            sce.getServletContext().setAttribute("inferenceOntModelSelector", inferenceOms);  //inferences
+            
+            
+            ApplicationBean appBean = getApplicationBeanFromOntModel(memModel,wadf);
+            if (appBean != null) {
+            	sce.getServletContext().setAttribute("applicationBean", appBean);
+            }
+            
+            if (isEmpty(memModel)) {
+            	loadDataFromFilesystem(memModel, sce.getServletContext());
+            }
+            
+            if (userAccountsModel.size() == 0) {
+            	readOntologyFilesInPathSet(AUTHPATH, sce.getServletContext(), userAccountsModel);
+	            if (userAccountsModel.size() == 0) {
+	            	createInitialAdminUser(userAccountsModel);
+	            }
+            }                        
+            
+            ensureEssentialInterfaceData(memModel, sce, wadf);        
+            
+        	NamespaceMapper namespaceMapper = new NamespaceMapperJena(unionModel, unionModel, defaultNamespace);
+        	sce.getServletContext().setAttribute("NamespaceMapper", namespaceMapper);
+        	memModel.getBaseModel().register(namespaceMapper);
+        	
+        	sce.getServletContext().setAttribute("defaultNamespace", defaultNamespace);
+        	       	
+        } catch (Throwable t) {
+            log.error("Throwable in " + this.getClass().getName(), t);
+            // printing the error because Tomcat doesn't print context listener
+            // errors the same way it prints other errors at startup
+            t.printStackTrace();
+            throw new Error(this.getClass().getName() + "failed");
+        }
+    } 
+
+    
+    private void checkForNamespaceMismatch(OntModel model, String defaultNamespace) {
+        String defaultNamespaceFromDeployProperites = ConfigurationProperties.getProperty("Vitro.defaultNamespace");
+        if( defaultNamespaceFromDeployProperites == null ){            
+            log.error("Could not get namespace from deploy.properties.");
+        }               
+        
+        List<String> portalURIs = new ArrayList<String>();
+        try {
+            model.enterCriticalSection(Lock.READ);
+            Iterator portalIt = model.listIndividuals(PORTAL);
+            while (portalIt.hasNext()) {
+                portalURIs.add( ((Individual)portalIt.next()).getURI() );                
+            }
+        } finally {
+            model.leaveCriticalSection();
+        }
+        if( portalURIs.size() > 0 ){
+            for( String portalUri : portalURIs){
+                if( portalUri != null && ! portalUri.startsWith(defaultNamespaceFromDeployProperites)){
+                    log.error("Namespace mismatch between db and deploy.properties.");
+                    log.error("Vivo will not start up correctly because the default namespace specified in deploy.properties does not match the namespace of " +
+                    		"a portal in the database. Namespace from deploy.properties: \"" + defaultNamespaceFromDeployProperites + 
+                            "\" Namespace from an existing portal: \"" + portalUri + "\" To get the application to start with this " +
+                            "database change the default namespace in deploy.properties " + portalUri.substring(0, portalUri.lastIndexOf("/")+1) + 
+                            "  Another possibility is that deploy.properties does not specify the intended database.");
+                }
+            }
+        }
+    }
+
+
+    /* ====================================================================== */
+    
+    
+    public void contextDestroyed(ServletContextEvent sce) {
+    }
+
+    private ApplicationBean getApplicationBeanFromOntModel(OntModel ontModel,WebappDaoFactory wadf) {
+       ClosableIterator appIt = ontModel.listIndividuals(ResourceFactory.createResource(VitroVocabulary.APPLICATION));
+        try {
+              if (appIt.hasNext()) {
+                  Individual appInd = (Individual) appIt.next();
+                  ApplicationBean appBean = new ApplicationBean();
+                  try {
+                      appBean.setMaxPortalId(Integer.decode( ((Literal)appInd.getPropertyValue(ResourceFactory.createProperty(VitroVocabulary.APPLICATION_MAXPORTALID))).getLexicalForm()));
+                  } catch (Exception e) { /* ignore bad value */ }
+                  try {
+                      appBean.setMinSharedPortalId(Integer.decode( ((Literal)appInd.getPropertyValue(ResourceFactory.createProperty(VitroVocabulary.APPLICATION_MINSHAREDPORTALID))).getLexicalForm()));
+                  } catch (Exception e) { /* ignore bad value */ }
+                  try {
+                     appBean.setMaxSharedPortalId(Integer.decode( ((Literal)appInd.getPropertyValue(ResourceFactory.createProperty(VitroVocabulary.APPLICATION_MAXSHAREDPORTALID))).getLexicalForm()));
+                  } catch (Exception e) { /* ignore bad value */}
+                  if( ! wadf.getApplicationDao().isFlag1Active() ){
+                	  appBean.setMaxPortalId(1);
+                  }
+                 return appBean;
+             } else {
+            	 return null;
+             }
+         } finally {
+             appIt.close();
+         }
+    }
+    
+    private void ensureEssentialInterfaceData(OntModel memModel, ServletContextEvent sce, WebappDaoFactory wadf) {
+        Model essentialInterfaceData = null;
+        ClosableIterator portalIt = memModel.listIndividuals(memModel.getResource(VitroVocabulary.PORTAL));
+        try {
+        	if (!portalIt.hasNext()) {
+        		log.debug("Loading initial site configuration");
+	        	essentialInterfaceData = InitialJenaModelUtils.loadInitialModel(sce.getServletContext(), defaultNamespace);
+	        	if (essentialInterfaceData.size() == 0) {
+	        		essentialInterfaceData = InitialJenaModelUtils.basicPortalAndRootTab(defaultNamespace);
+	        		essentialInterfaceData.add(InitialJenaModelUtils.basicClassgroup(wadf.getDefaultNamespace()));
+	        	}
+	            //JenaModelUtils.makeClassGroupsFromRootClasses(wadf,memModel,essentialInterfaceData);       
+	            memModel.add(essentialInterfaceData);
+        	} else {
+        		//Set the default namespace to the namespace of the first portal object we find.
+        		//This will keep existing applications from dying when the default namespace
+        		//config option is missing.
+        		Individual portal = (Individual) portalIt.next();
+        		if (portal.getNameSpace() != null) {
+        			defaultNamespace = portal.getNameSpace();
+        		}
+        	}
+        } finally {
+        	portalIt.close();
+        }
+    }
+    
+    private void checkMainModelForUserAccounts(OntModel mainModel, OntModel userAccountsModel) {
+    	Model extractedUserData = ((new JenaModelUtils()).extractUserAccountsData(mainModel));
+		if (extractedUserData.size() > 0) {
+			userAccountsModel.enterCriticalSection(Lock.WRITE);
+			try {
+				userAccountsModel.add(extractedUserData);
+			} finally {
+				userAccountsModel.leaveCriticalSection();
+			}
+			mainModel.enterCriticalSection(Lock.WRITE);
+			try {
+				mainModel.remove(extractedUserData);
+			} finally {
+				mainModel.leaveCriticalSection();
+			}
+		}
+    }
+    
+    private OntModel ontModelFromContextAttribute(ServletContext ctx, String attribute) {
+    	OntModel ontModel;
+    	Object attributeValue = ctx.getAttribute(attribute);
+    	if (attributeValue != null && attributeValue instanceof OntModel) {
+    		ontModel = (OntModel) attributeValue;
+    	} else {
+    		ontModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+    		ctx.setAttribute(attribute, ontModel);
+    	}
+    	return ontModel;
+    }
+    
+    private boolean isEmpty(Model model) {
+    	ClosableIterator closeIt = model.listStatements();
+    	try {
+			if (closeIt.hasNext()) {
+				return false;
+			} else {
+				return true;
+			}
+    	} finally {
+    		closeIt.close();
+    	}
+    }
+    
+    private void loadDataFromFilesystem(OntModel ontModel, ServletContext ctx) {
+    	OntModel initialDataModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+    	Long startTime = System.currentTimeMillis();
+        log.debug("Reading ontology files");    
+        readOntologyFilesInPathSet(USERPATH, ctx, initialDataModel);
+        readOntologyFilesInPathSet(SYSTEMPATH, ctx, initialDataModel);
+        log.debug(((System.currentTimeMillis()-startTime)/1000)+" seconds to read ontology files ");
+        ontModel.add(initialDataModel);
+    }
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaPersistentDataSourceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaPersistentDataSourceSetup.java
index 6cd0cdae5..f04ef28ab 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaPersistentDataSourceSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaPersistentDataSourceSetup.java
@@ -6,6 +6,7 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
+import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -27,6 +28,9 @@ public class JenaPersistentDataSourceSetup extends JenaDataSourceSetupBase imple
 		boolean firstStartup = false;
 		
         try {
+        	
+        	
+        	
             dbModel = makeDBModelFromConfigurationProperties(JENA_DB_MODEL, DB_ONT_MODEL_SPEC);
             
             ClosableIterator stmtIt = dbModel.listStatements();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
new file mode 100644
index 000000000..dd0c3d7bb
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
@@ -0,0 +1,125 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet.setup;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mindswap.pellet.PelletOptions;
+
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.sdb.StoreDesc;
+import com.hp.hpl.jena.sdb.store.DatabaseType;
+import com.hp.hpl.jena.sdb.store.LayoutType;
+import com.hp.hpl.jena.vocabulary.OWL;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelectorImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDBGraphGenerator;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RegeneratingGraph;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.SDBGraphGenerator;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.ReasonerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
+import edu.cornell.mannlib.vitro.webapp.reasoner.support.SimpleReasonerTBoxListener;
+import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase.TripleStoreType;
+
+public class SimpleReasonerSetup implements ServletContextListener {
+
+	private static final Log log = LogFactory.getLog(SimpleReasonerSetup.class.getName());
+	
+	// Models used during a full recompute of the ABox
+	static final String JENA_INF_MODEL_REBUILD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-rebuild";
+	static final String JENA_INF_MODEL_SCRATCHPAD = "http://vitro.mannlib.cornell.edu/default/vitro-kb-inf-scratchpad";
+
+	public void contextInitialized(ServletContextEvent sce) {
+		
+		try {	
+		    // set up Pellet reasoning for the TBox	
+			
+			OntModelSelectorImpl assertionsOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("baseOntModelSelector");
+			OntModelSelectorImpl inferencesOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("inferenceOntModelSelector");
+			OntModelSelectorImpl unionOms = (OntModelSelectorImpl) sce.getServletContext().getAttribute("unionOntModelSelector");
+
+			WebappDaoFactoryJena wadf = (WebappDaoFactoryJena) sce.getServletContext().getAttribute("webappDaoFactory");
+			
+			if (!assertionsOms.getTBoxModel().getProfile().NAMESPACE().equals(OWL.NAMESPACE.getNameSpace())) {		
+				log.error("Not connecting Pellet reasoner - the TBox assertions model is not an OWL model");
+				return;
+			}
+	        
+	        // Set various Pellet options for incremental consistency checking, etc.
+			PelletOptions.DL_SAFE_RULES = true;
+	        PelletOptions.USE_COMPLETION_QUEUE = true;
+	        PelletOptions.USE_TRACING = true;
+	        PelletOptions.TRACK_BRANCH_EFFECTS = true;
+	        PelletOptions.USE_INCREMENTAL_CONSISTENCY = true;
+	        PelletOptions.USE_INCREMENTAL_DELETION = true;
+	         
+	        PelletListener pelletListener = new PelletListener(unionOms.getTBoxModel(),assertionsOms.getTBoxModel(),inferencesOms.getTBoxModel(),ReasonerConfiguration.DEFAULT);
+	        sce.getServletContext().setAttribute("pelletListener",pelletListener);
+	        sce.getServletContext().setAttribute("pelletOntModel", pelletListener.getPelletModel());
+	        
+	        if (wadf != null) {
+	        	wadf.setPelletListener(pelletListener);
+	        }
+	        
+	        log.info("Pellet reasoner connected for the TBox");
+     
+	       // set up simple reasoning for the ABox
+	    	    	
+	        BasicDataSource bds = JenaDataSourceSetupBase.getApplicationDataSource(sce.getServletContext());
+            Model rebuildModel = makeDBModel(bds, JENA_INF_MODEL_REBUILD, JenaDataSourceSetupBase.DB_ONT_MODEL_SPEC, TripleStoreType.SDB);            
+            Model scratchModel = makeDBModel(bds, JENA_INF_MODEL_SCRATCHPAD, JenaDataSourceSetupBase.DB_ONT_MODEL_SPEC, TripleStoreType.SDB); 
+            
+	        
+	        // the simple reasoner will register itself as a listener to the ABox assertions
+	        SimpleReasoner simpleReasoner = new SimpleReasoner(unionOms.getTBoxModel(), assertionsOms.getABoxModel(), inferencesOms.getABoxModel(), rebuildModel, scratchModel);
+
+	        assertionsOms.getTBoxModel().register(new SimpleReasonerTBoxListener(simpleReasoner));
+	        
+	        sce.getServletContext().setAttribute("simpleReasoner",simpleReasoner);
+	        
+	        log.info("Simple reasoner connected for the ABox");
+	        
+		} catch (Throwable t) {
+			t.printStackTrace();
+		}		
+	}
+	
+	public void contextDestroyed(ServletContextEvent arg0) {
+		// nothing to do
+	}
+  
+   protected Model makeDBModel(BasicDataSource ds, String jenaDbModelName, OntModelSpec jenaDbOntModelSpec, TripleStoreType storeType) {
+	   String DB = "MySQL";    // database type
+	   Model dbModel = null;
+       try {
+           //  open the db model
+            try {
+                Graph g = null;
+                switch (storeType) {
+                	case RDB:
+                		g = new RegeneratingGraph(new RDBGraphGenerator(ds, DB, jenaDbModelName)); break;
+                	case SDB:
+                		StoreDesc desc = new StoreDesc(LayoutType.LayoutTripleNodesHash, DatabaseType.MySQL);
+                    	g = new RegeneratingGraph(new SDBGraphGenerator(ds, desc, jenaDbModelName)); break;
+                	default: throw new RuntimeException ("Unsupported store type " + storeType); 
+                }
+                dbModel = ModelFactory.createModelForGraph(g);
+                log.debug("Using database at "+ds.getUrl());
+            } catch (Throwable t) {
+                t.printStackTrace();
+            }
+       } catch (Throwable t) {
+           t.printStackTrace();
+       }
+       return dbModel;
+   }
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java
new file mode 100644
index 000000000..203f7d260
--- /dev/null
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/reasoner/SimpleReasonerTest.java
@@ -0,0 +1,312 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.reasoner;
+
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.mindswap.pellet.jena.PelletReasonerFactory;
+
+import com.hp.hpl.jena.ontology.OntClass;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.reasoner.support.SimpleReasonerTBoxListener;
+
+
+public class SimpleReasonerTest {
+
+	@Test
+	public void addTypes(){
+	
+		// Create a Tbox with a simple class hierarchy. D and E are subclasses of C. B and C are subclasses of A.
+		// Pellet will compute TBox inferences
+		OntModel tBox = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); 
+		
+		OntClass classA = tBox.createClass("http://test.vivo/A");
+	    classA.setLabel("class A", "en-US");
+
+		OntClass classB = tBox.createClass("http://test.vivo/B");
+	    classB.setLabel("class B", "en-US");
+
+		OntClass classC = tBox.createClass("http://test.vivo/C");
+	    classC.setLabel("class C", "en-US");
+
+	    OntClass classD = tBox.createClass("http://test.vivo/D");
+	    classD.setLabel("class D", "en-US");
+	    
+	    OntClass classE = tBox.createClass("http://test.vivo/E");
+	    classE.setLabel("class E", "en-US");
+	    
+	    classC.addSubClass(classD);
+	    classC.addSubClass(classE);
+	    
+        classA.addSubClass(classB);
+        classA.addSubClass(classC);
+        
+        // this is the model to receive inferences
+        Model inf = ModelFactory.createDefaultModel();
+        
+		// create an Abox and register the SimpleReasoner listener with it
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		aBox.register(new SimpleReasoner(tBox, aBox, inf));
+		
+        // add a statement to the ABox that individual x is of type E.
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+		aBox.add(ind_x, RDF.type, classE);		
+
+		// Verify that "x is of type C" was inferred
+		Statement xisc = ResourceFactory.createStatement(ind_x, RDF.type, classC);	
+		Assert.assertTrue(inf.contains(xisc));	
+		
+		// Verify that "x is of type A" was inferred
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Assert.assertTrue(inf.contains(xisa));	
+	}
+
+	
+	@Test
+	public void removeTypes(){
+	
+		// Create a Tbox with a simple class hierarchy. C is a subclass of B and B is a subclass of A.
+		// Pellet will compute TBox inferences
+		
+		OntModel tBox = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); 
+		
+		OntClass classA = tBox.createClass("http://test.vivo/A");
+	    classA.setLabel("class A", "en-US");
+
+		OntClass classB = tBox.createClass("http://test.vivo/B");
+	    classB.setLabel("class B", "en-US");
+
+		OntClass classC = tBox.createClass("http://test.vivo/C");
+	    classC.setLabel("class C", "en-US");
+	    
+	    classB.addSubClass(classC);
+	    classA.addSubClass(classB);
+        
+        // this is the model to receive inferences
+        Model inf = ModelFactory.createDefaultModel();
+        
+		// create an Abox and register the SimpleReasoner listener with it
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+		aBox.register(new SimpleReasoner(tBox, aBox, inf));
+		
+        // add a statement to the ABox that individual x is of type C.
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+		aBox.add(ind_x, RDF.type, classC);		
+
+        // add a statement to the ABox that individual x is of type B.
+		aBox.add(ind_x, RDF.type, classB);		
+
+		// remove the statement that individual x is of type C
+		aBox.remove(ind_x, RDF.type, classC);
+		
+		// Verify that the inference graph contains the statement that x is of type A.
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Assert.assertTrue(inf.contains(xisa));	
+	}
+	
+
+	// This tests added TBox subClassOf and equivalentClass statements.
+	// The ABox data that will be the basis for the inference will
+	// be in the ABox graph.
+	@Test
+	public void addSubClass1(){
+				
+		// Create TBox, ABox and Inference models and register
+		// the ABox reasoner listeners with the ABox and TBox
+		// Pellet will compute TBox inferences
+		
+		OntModel tBox = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+        Model inf = ModelFactory.createDefaultModel();
+		
+        SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
+		aBox.register(simpleReasoner);
+		tBox.register(new SimpleReasonerTBoxListener(simpleReasoner));
+
+		// Add classes classes A, B, C and D to the TBox
+	
+		OntClass classA = tBox.createClass("http://test.vivo/A");
+	    classA.setLabel("class A", "en-US");
+
+		OntClass classB = tBox.createClass("http://test.vivo/B");
+	    classB.setLabel("class B", "en-US");
+
+		OntClass classC = tBox.createClass("http://test.vivo/C");
+	    classC.setLabel("class C", "en-US");
+
+	    OntClass classD = tBox.createClass("http://test.vivo/D");
+	    classD.setLabel("class D", "en-US");
+	    	   
+        // Add a statement that individual x is of type C to the ABox
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+		aBox.add(ind_x, RDF.type, classC);		
+	    
+        // Add a statement that C is a subclass of A to the TBox	
+	    
+	    classA.addSubClass(classC);
+		
+		// Verify that "x is of type A" was inferred
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Assert.assertTrue(inf.contains(xisa));
+
+		// Verify that "x is of type B" was not inferred
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
+		Assert.assertFalse(inf.contains(xisb));	
+
+		// Verify that "x is of type D" was not inferred
+		Statement xisd = ResourceFactory.createStatement(ind_x, RDF.type, classD);	
+		Assert.assertFalse(inf.contains(xisd));	
+		
+	}
+
+	
+	// this tests added TBox subClassOf and equivalentClass statements.
+	// The ABox data that is the basis for the inference will be
+	// in the inferred graph
+	@Test
+	public void addSubClass2(){
+				
+		// Create TBox, ABox and Inference models and register
+		// the ABox reasoner listeners with the ABox and TBox
+		// Pellet will compute TBox inferences
+		
+		OntModel tBox = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+        Model inf = ModelFactory.createDefaultModel();
+		
+        SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
+		aBox.register(simpleReasoner);
+		tBox.register(new SimpleReasonerTBoxListener(simpleReasoner));
+
+		// Add classes classes A, B, C and D to the TBox
+	    // D is a subclass of C
+		
+		OntClass classA = tBox.createClass("http://test.vivo/A");
+	    classA.setLabel("class A", "en-US");
+
+		OntClass classB = tBox.createClass("http://test.vivo/B");
+	    classB.setLabel("class B", "en-US");
+
+		OntClass classC = tBox.createClass("http://test.vivo/C");
+	    classC.setLabel("class C", "en-US");
+
+	    OntClass classD = tBox.createClass("http://test.vivo/D");
+	    classD.setLabel("class D", "en-US");
+	    	   
+	    classC.addSubClass(classD);
+	    
+        // Add a statement that individual x is of type D to the ABox
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+		aBox.add(ind_x, RDF.type, classD);		
+	    
+        // Add a statement that C is a subclass of A to the TBox	
+	    classA.addSubClass(classC);
+		
+		// Verify that "x is of type A" was inferred
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Assert.assertTrue(inf.contains(xisa));		
+	}
+	
+	@Test
+	// this tests incremental reasoning as a result of the removal of a subClassOf 
+	// or equivalentClass statement from the TBox.
+	public void removeSubClass(){
+		// Create TBox, ABox and Inference models and register
+		// the ABox reasoner listeners with the ABox and TBox
+		// Pellet will compute TBox inferences
+		
+		OntModel tBox = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC); 
+		OntModel aBox = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM); 
+        Model inf = ModelFactory.createDefaultModel();
+		
+        SimpleReasoner simpleReasoner = new SimpleReasoner(tBox, aBox, inf);
+		aBox.register(simpleReasoner);
+		tBox.register(new SimpleReasonerTBoxListener(simpleReasoner));
+
+		// Add classes A, B, C, D, E, F, G and H to the TBox.
+		// B, C and D are subclasses of A.
+		// E is a subclass of B.
+		// F and G are subclasses of C.
+		// H is a subclass of D.
+	
+		OntClass classA = tBox.createClass("http://test.vivo/A");
+	    classA.setLabel("class A", "en-US");
+
+		OntClass classB = tBox.createClass("http://test.vivo/B");
+	    classB.setLabel("class B", "en-US");
+
+		OntClass classC = tBox.createClass("http://test.vivo/C");
+	    classC.setLabel("class C", "en-US");
+
+	    OntClass classD = tBox.createClass("http://test.vivo/D");
+	    classD.setLabel("class D", "en-US");
+	    
+	    OntClass classE = tBox.createClass("http://test.vivo/E");
+	    classE.setLabel("class E", "en-US");
+	    
+	    OntClass classF = tBox.createClass("http://test.vivo/F");
+	    classF.setLabel("class F", "en-US");
+
+	    OntClass classG = tBox.createClass("http://test.vivo/G");
+	    classG.setLabel("class G", "en-US");
+
+	    OntClass classH = tBox.createClass("http://test.vivo/H");
+	    classH.setLabel("class H", "en-US");
+
+	    classA.addSubClass(classB);
+	    classA.addSubClass(classC);
+	    classA.addSubClass(classD);
+	    classB.addSubClass(classE);
+	    classC.addSubClass(classF);
+	    classC.addSubClass(classG);
+	    classD.addSubClass(classH);
+	    
+        // Add a statement that individual x is of type E to the ABox
+		Resource ind_x = aBox.createResource("http://test.vivo/x");
+		aBox.add(ind_x, RDF.type, classE);		
+	    
+		// Remove the statement that B is a subclass of A from the TBox
+		classA.removeSubClass(classB);
+		
+		// Verify that "x is of type A" is not in the inference graph
+		Statement xisa = ResourceFactory.createStatement(ind_x, RDF.type, classA);	
+		Assert.assertFalse(inf.contains(xisa));
+
+		
+		// Verify that "x is of type B" is in the inference graph
+		Statement xisb = ResourceFactory.createStatement(ind_x, RDF.type, classB);	
+		Assert.assertTrue(inf.contains(xisb));	
+
+        // Add statements that individual y is of types F and H to the ABox
+		Resource ind_y = aBox.createResource("http://test.vivo/y");
+		aBox.add(ind_y, RDF.type, classF);	
+		aBox.add(ind_y, RDF.type, classH);
+		
+		// Remove the statement that C is a subclass of A from the TBox
+		classA.removeSubClass(classC);
+
+		// Verify that "y is of type A" is in the inference graph
+		Statement yisa = ResourceFactory.createStatement(ind_y, RDF.type, classA);	
+		Assert.assertTrue(inf.contains(yisa));
+				
+	}
+	
+	
+	// To help in debugging the unit test
+	void printModels(OntModel ontModel) {
+	    
+		System.out.println("\nThe model has " + ontModel.size() + " statements:");
+		System.out.println("---------------------------------------------------");
+		ontModel.writeAll(System.out,"N3",null);
+		
+	}	
+}
\ No newline at end of file
diff --git a/webapp/web/admin/sparqlquery/sparqlForm.jsp b/webapp/web/admin/sparqlquery/sparqlForm.jsp
index e610d82bd..1bd70229d 100644
--- a/webapp/web/admin/sparqlquery/sparqlForm.jsp
+++ b/webapp/web/admin/sparqlquery/sparqlForm.jsp
@@ -38,8 +38,10 @@ PREFIX <%=prefixText%>: <<%=urlText%>><%}}%>
 SELECT ?geoLocation ?label
 WHERE
 {
+  GRAPH ?g{
   ?geoLocation rdf:type core:GeographicLocation .
-  OPTIONAL { ?geoLocation rdfs:label ?label }
+  OPTIONAL { ?geoLocation rdfs:label ?label } .
+  }
 }
 LIMIT 20
 </textarea>