diff --git a/solr/homeDirectoryTemplate/conf/schema.xml b/solr/homeDirectoryTemplate/conf/schema.xml
index b784f33c9..95b616d3e 100644
--- a/solr/homeDirectoryTemplate/conf/schema.xml
+++ b/solr/homeDirectoryTemplate/conf/schema.xml
@@ -250,6 +250,11 @@
   <copyField source="nameRaw" dest="acNameStemmed" /> 
   <copyField source="nameRaw" dest="nameText" />
   <!--  nameLowercaseSingleValued is not copied from nameRaw becasue nameRaw might have multiple values -->
+  
+  <!-- field for hash signature, used for comparing to versions from external caches -->
+  <field name="etag" type="string" stored="true" indexed="false" multiValued="false" />
+
+  
      
   <!-- ****************************  End Vitro Fields *************************** -->
   <!-- ****************************  Dynamic Fields *************************** -->
diff --git a/solr/homeDirectoryTemplate/conf/solrconfig.xml b/solr/homeDirectoryTemplate/conf/solrconfig.xml
index 4c6bca060..bfe0ae889 100644
--- a/solr/homeDirectoryTemplate/conf/solrconfig.xml
+++ b/solr/homeDirectoryTemplate/conf/solrconfig.xml
@@ -856,18 +856,14 @@
        type header if posted in the body. For example, curl now
        requires: -H 'Content-type:text/xml; charset=utf-8'
     -->
-  <requestHandler name="/update" 
+  <requestHandler name="/update"
                   class="solr.XmlUpdateRequestHandler">
-    <!-- See below for information on defining 
-         updateRequestProcessorChains that can be used by name 
-         on each Update Request
-      -->
-    <!--
+    <!-- Run the etag processor on each update request. -->
        <lst name="defaults">
-         <str name="update.processor">dedupe</str>
+         <str name="update.processor">etag</str>
        </lst>
-       -->
-    </requestHandler>
+  </requestHandler>
+  
   <!-- Binary Update Request Handler
        http://wiki.apache.org/solr/javabin
     -->
@@ -1480,6 +1476,23 @@
      </updateRequestProcessorChain>
     -->
 
+  <!-- ETag generation
+
+       Creates the "etag" field on the fly based on a hash of all other
+       fields.  
+       
+    -->
+     <updateRequestProcessorChain name="etag">
+       <processor class="solr.processor.SignatureUpdateProcessorFactory">
+         <bool name="enabled">true</bool>
+         <str name="signatureField">etag</str>
+         <bool name="overwriteDupes">false</bool>
+         <str name="signatureClass">solr.processor.Lookup3Signature</str>
+       </processor>
+       <processor class="solr.LogUpdateProcessorFactory" />
+       <processor class="solr.RunUpdateProcessorFactory" />
+     </updateRequestProcessorChain>
+
   <!-- Response Writers
 
        http://wiki.apache.org/solr/QueryResponseWriter
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
index 04ec6f276..d9a719483 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
@@ -10,6 +10,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
@@ -101,13 +102,7 @@ public class LoginStatusBean {
 		}
 
 		ServletContext ctx = session.getServletContext();
-		WebappDaoFactory wadf = (WebappDaoFactory) ctx
-				.getAttribute("webappDaoFactory");
-		if (wadf == null) {
-			log.error("No WebappDaoFactory");
-			return null;
-		}
-
+		WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 		UserAccountsDao userAccountsDao = wadf.getUserAccountsDao();
 		if (userAccountsDao == null) {
 			log.error("No UserAccountsDao");
diff --git a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index b99743132..0a0bd6b87 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -25,7 +25,9 @@ import edu.cornell.mannlib.vedit.util.FormUtils;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 
 public class BaseEditController extends VitroHttpServlet {
@@ -153,39 +155,32 @@ public class BaseEditController extends VitroHttpServlet {
         }
     }
     
-    protected String MODEL_ATTR_NAME = "jenaOntModel";
-    
     protected OntModel getOntModel( HttpServletRequest request, ServletContext ctx ) {
-
+
+    	// TODO: JB - This method gets the UNION FULL model from the session, if there is one, 
+    	// TODO and the BASE_TBOX model otherwise.
     	OntModel ontModel = null;
-    	
-    	try {
-    		ontModel = (OntModel) request.getSession().getAttribute(MODEL_ATTR_NAME);
+    	try {
+    		ontModel = ModelAccess.on(request.getSession()).getJenaOntModel();
     	} catch (Exception e) {
     	    // ignoring any problems here - we're not really expecting
     	    // this attribute to be populated anyway
     	}
     	
     	if ( ontModel == null ) {
-            ontModel = (OntModel) ModelContext.getBaseOntModelSelector(ctx).getTBoxModel();
+            ontModel = ModelAccess.on(ctx).getOntModel(ModelID.BASE_TBOX);
     	}
     	
     	return ontModel;
     	
     }
     
-    protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq) {
-        WebappDaoFactory wadf = (WebappDaoFactory) getServletContext().getAttribute(
-                "assertionsWebappDaoFactory");
-        if (wadf == null) {
-            log.info("Using vreq.getFullWebappDaoFactory()");
-            wadf = vreq.getFullWebappDaoFactory();
-        } 
-        return wadf;
+    protected WebappDaoFactory getWebappDaoFactory() {
+    	return ModelAccess.on(getServletContext()).getBaseWebappDaoFactory();
     }
     
-    protected WebappDaoFactory getWebappDaoFactory(VitroRequest vreq, String userURI) {
-        return getWebappDaoFactory(vreq).getUserAwareDaoFactory(userURI);
+    protected WebappDaoFactory getWebappDaoFactory(String userURI) {
+        return getWebappDaoFactory().getUserAwareDaoFactory(userURI);
     }
     
     public String getDefaultLandingPage(HttpServletRequest request) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
index 21ecf1741..ea00f16d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
@@ -16,18 +16,19 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.ontology.OntModel;
 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.Model;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * The current user is blacklisted for this reason.
@@ -152,7 +153,7 @@ public class IsBlacklisted extends AbstractCommonIdentifier implements
 			return NOT_BLACKLISTED;
 		}
 
-		Model model = (Model) context.getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(context).getJenaOntModel();
 
 		queryString = queryString.replaceAll("\\?individualURI",
 				"<" + ind.getURI() + ">");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java
index ff5693355..2a45c4769 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/BaseIdentifierBundleFactory.java
@@ -6,6 +6,7 @@ import javax.servlet.ServletContext;
 
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
@@ -24,16 +25,7 @@ public abstract class BaseIdentifierBundleFactory implements
 			throw new NullPointerException("ctx may not be null.");
 		}
 		this.ctx = ctx;
-
-		Object wdfObject = ctx.getAttribute("webappDaoFactory");
-		if (wdfObject instanceof WebappDaoFactory) {
-			this.wdf = (WebappDaoFactory) wdfObject;
-		} else {
-			throw new IllegalStateException(
-					"Didn't find a WebappDaoFactory in the context. Found '"
-							+ wdfObject + "' instead.");
-		}
-
+		this.wdf = ModelAccess.on(ctx).getWebappDaoFactory();
 		this.uaDao = wdf.getUserAccountsDao();
 		this.indDao = wdf.getIndividualDao();
 	}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
index c98120dec..80aae91d2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/DisplayByRolePermission.java
@@ -114,9 +114,11 @@ public class DisplayByRolePermission extends Permission {
 		ObjectPropertyStatement stmt = action.getObjectPropertyStatement();
 		String subjectUri = stmt.getSubjectURI();
 		String predicateUri = stmt.getPropertyURI();
+		String rangeUri = (stmt.getProperty() == null) ? null 
+		        : stmt.getProperty().getRangeVClassURI();
 		String objectUri = stmt.getObjectURI();
 		return canDisplayResource(subjectUri)
-				&& canDisplayPredicate(predicateUri)
+				&& canDisplayPredicate(predicateUri, rangeUri)
 				&& canDisplayResource(objectUri);
 	}
 
@@ -124,10 +126,14 @@ public class DisplayByRolePermission extends Permission {
 		return PropertyRestrictionPolicyHelper.getBean(ctx).canDisplayResource(
 				resourceUri, this.roleLevel);
 	}
-
+	
 	private boolean canDisplayPredicate(String predicateUri) {
+	    return canDisplayPredicate(predicateUri, null);
+	}
+
+	private boolean canDisplayPredicate(String predicateUri, String rangeUri) {
 		return PropertyRestrictionPolicyHelper.getBean(ctx)
-				.canDisplayPredicate(predicateUri, this.roleLevel);
+				.canDisplayPredicate(predicateUri, rangeUri, this.roleLevel);
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
index 8b1f457d5..94608e5a1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
@@ -32,10 +32,10 @@ import com.hp.hpl.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
@@ -100,8 +100,7 @@ public class PermissionSetsLoader implements ServletContextListener {
 			this.ctx = ctx;
 			this.ss = ss;
 
-			this.userAccountsModel = ModelContext.getBaseOntModelSelector(ctx)
-					.getUserAccountsModel();
+			this.userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel();
 			this.permissionSetType = this.userAccountsModel
 					.getProperty(VitroVocabulary.PERMISSIONSET);
 
@@ -274,8 +273,7 @@ public class PermissionSetsLoader implements ServletContextListener {
 			this.ctx = ctx;
 			this.ss = ss;
 
-			WebappDaoFactory wadf = (WebappDaoFactory) ctx
-					.getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			if (wadf == null) {
 				throw new IllegalStateException(
 						"No webappDaoFactory on the servlet context");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
index 9c635a6cf..2b43662e2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.auth.policy;
 
-import java.util.Collections;
-import java.util.Set;
 import java.util.TreeSet;
 
 import javax.servlet.ServletContext;
@@ -23,8 +21,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 /**
@@ -79,7 +77,8 @@ public class RootUserPolicy implements PolicyIface {
 			ss = StartupStatus.getBean(ctx);
 
 			try {
-				uaDao = getUserAccountsDao();
+				uaDao = ModelAccess.on(ctx).getWebappDaoFactory()
+						.getUserAccountsDao();
 				configuredRootUser = getRootEmailFromConfig();
 
 				otherRootUsers = getEmailsOfAllRootUsers();
@@ -105,16 +104,6 @@ public class RootUserPolicy implements PolicyIface {
 			}
 		}
 
-		private UserAccountsDao getUserAccountsDao() {
-			WebappDaoFactory wadf = (WebappDaoFactory) ctx
-					.getAttribute("webappDaoFactory");
-			if (wadf == null) {
-				throw new IllegalStateException(
-						"No webappDaoFactory on the servlet context");
-			}
-			return wadf.getUserAccountsDao();
-		}
-
 		private String getRootEmailFromConfig() {
 			String email = ConfigurationProperties.getBean(ctx).getProperty(
 					PROPERTY_ROOT_USER_EMAIL);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
index 6afeb27b0..e617a6f53 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
@@ -13,6 +13,7 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.listener.ChangeListener;
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * Add this ChangeListener to your EditProcessObject when modifying the
@@ -90,7 +91,7 @@ public class PropertyRestrictionListener implements ChangeListener {
 	}
 
 	private void createAndSetBean() {
-		OntModel model = (OntModel) ctx.getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(ctx).getJenaOntModel();
 		PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
 				.createBean(model);
 		PropertyRestrictionPolicyHelper.setBean(ctx, bean);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
index 68ee18b04..70b38cbeb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
@@ -26,6 +26,7 @@ import com.hp.hpl.jena.rdf.model.impl.Util;
 import com.hp.hpl.jena.shared.Lock;
 
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -256,17 +257,23 @@ public class PropertyRestrictionPolicyHelper {
 		log.debug("can modify resource '" + resourceUri + "'");
 		return true;
 	}
+	
+	public boolean canDisplayPredicate(String predicateUri, RoleLevel userRole) {
+	    return canDisplayPredicate(predicateUri, null, userRole);
+	}
 
 	/**
 	 * If display of a predicate is restricted, the user's role must be at least
 	 * as high as the restriction level.
 	 */
-	public boolean canDisplayPredicate(String predicateUri, RoleLevel userRole) {
+	public boolean canDisplayPredicate(String predicateUri, String rangeUri, RoleLevel userRole) {
 		if (predicateUri == null) {
 			log.debug("can't display predicate: predicateUri was null");
 			return false;
 		}
 
+		// TODO insert combo logic here
+		
 		RoleLevel displayThreshold = displayThresholdMap.get(predicateUri);
 		if (isAuthorized(userRole, displayThreshold)) {
 			log.debug("can display predicate: '" + predicateUri
@@ -344,7 +351,7 @@ public class PropertyRestrictionPolicyHelper {
 			StartupStatus ss = StartupStatus.getBean(ctx);
 
 			try {
-				OntModel model = (OntModel) ctx.getAttribute("jenaOntModel");
+				OntModel model = ModelAccess.on(ctx).getJenaOntModel();
 				if (model == null) {
 					throw new NullPointerException(
 							"jenaOntModel has not been initialized.");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
index 6aab54794..d4c92de57 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/AbstractPageHandler.java
@@ -19,12 +19,12 @@ import com.hp.hpl.jena.ontology.OntModel;
 
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
 
@@ -56,12 +56,10 @@ public abstract class AbstractPageHandler {
 		this.i18n = I18n.bundle(vreq);
 		this.ctx = vreq.getSession().getServletContext();
 
-		OntModelSelector oms = ModelContext.getUnionOntModelSelector(ctx);
-		userAccountsModel = oms.getUserAccountsModel();
-		unionModel = oms.getFullModel();
+		userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel();
+		unionModel = ModelAccess.on(ctx).getOntModel(ModelID.UNION_FULL);
 
-		WebappDaoFactory wdf = (WebappDaoFactory) this.ctx
-				.getAttribute("webappDaoFactory");
+		WebappDaoFactory wdf = ModelAccess.on(ctx).getWebappDaoFactory();
 		userAccountsDao = wdf.getUserAccountsDao();
 		vclassDao = wdf.getVClassDao();
 		indDao = wdf.getIndividualDao();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java
index db59e7174..93def6de3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FedoraDatastreamController.java
@@ -42,6 +42,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
@@ -101,7 +102,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons
             log.debug("In doGet");
             
             VitroRequest vreq = new VitroRequest(req);
-            OntModel sessionOntModel = (OntModel)vreq.getSession().getAttribute("jenaOntModel");
+    		OntModel sessionOntModel = ModelAccess.on(vreq.getSession()).getJenaOntModel();
             
             synchronized (FedoraDatastreamController.class) {
                 if( fedoraUrl == null ){
@@ -231,7 +232,7 @@ public class FedoraDatastreamController extends VitroHttpServlet implements Cons
         	}
         	
             //check if fedora is on line
-            OntModel sessionOntModel = (OntModel)rawRequest.getSession().getAttribute("jenaOntModel");
+    		OntModel sessionOntModel = ModelAccess.on(rawRequest.getSession()).getJenaOntModel();
             synchronized (FedoraDatastreamController.class) {
                 if( fedoraUrl == null ){
                     setup( sessionOntModel, getServletContext() );
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
index 6d85141e2..0e961c262 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/OntologyController.java
@@ -27,6 +27,7 @@ import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.shared.Lock;
 
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaOutputUtils;
 import edu.cornell.mannlib.vitro.webapp.web.ContentType;
 
@@ -127,12 +128,7 @@ public class OntologyController extends VitroHttpServlet{
 	     String url = ontology;
 	     
 	    		
-		OntModel ontModel = null;
-		HttpSession session = vreq.getSession(false);
-		if( session != null )
-			ontModel =(OntModel)session.getAttribute("jenaOntModel");		
-		if( ontModel == null)
-			ontModel = (OntModel)getServletContext().getAttribute("jenaOntModel");
+		OntModel ontModel = ModelAccess.on(vreq.getSession()).getJenaOntModel();
 
         boolean found = false;
         Model newModel = ModelFactory.createDefaultModel();			
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 88416f911..872456791 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroRequest.java
@@ -2,13 +2,11 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller;
 
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL;
 
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -17,8 +15,8 @@ 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.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource.ModelName;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
@@ -73,13 +71,9 @@ public class VitroRequest extends HttpServletRequestWrapper {
         setAttribute("unfilteredRDFService", rdfService);
     }
     
-    public void setWebappDaoFactory( WebappDaoFactory wdf){
-        setAttribute("webappDaoFactory",wdf);
-    }
-    
     /** gets WebappDaoFactory with appropriate filtering for the request */
     public WebappDaoFactory getWebappDaoFactory(){
-    	return (WebappDaoFactory) getAttribute("webappDaoFactory");
+    	return ModelAccess.on(this).getWebappDaoFactory();
     }
     
     public void setUnfilteredWebappDaoFactory(WebappDaoFactory wdf) {
@@ -94,10 +88,6 @@ public class VitroRequest extends HttpServletRequestWrapper {
     	return (WebappDaoFactory) getAttribute("unfilteredWebappDaoFactory");
     }
     
-    public void setFullWebappDaoFactory(WebappDaoFactory wdf) {
-    	setAttribute("fullWebappDaoFactory", wdf);
-    }
-    
     public Dataset getDataset() {
     	return (Dataset) getAttribute("dataset");
     }
@@ -106,63 +96,16 @@ public class VitroRequest extends HttpServletRequestWrapper {
     	setAttribute("dataset", dataset);
     }
     
-    public void setJenaOntModel(OntModel ontModel) {
-    	setAttribute("jenaOntModel", ontModel);
-    }
-    
-    public void setOntModelSelector(OntModelSelector oms) {
-        setAttribute("ontModelSelector", oms);
-    }
-    
     /** gets assertions + inferences WebappDaoFactory with no filtering **/
     public WebappDaoFactory getFullWebappDaoFactory() {
-    	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");	
-	        }
-    	}
+    	return ModelAccess.on(this).getWebappDaoFactory();
     }
     
     /** gets assertions-only WebappDaoFactory with no filtering */
     public WebappDaoFactory getAssertionsWebappDaoFactory() {
-    	Object webappDaoFactoryAttr = _req.getSession().getAttribute("assertionsWebappDaoFactory");
-        if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
-             log.debug("Returning assertionsWebappDaoFactory from session");
-             return (WebappDaoFactory) webappDaoFactoryAttr;
-        } else {
-            webappDaoFactoryAttr = getAttribute("assertionsWebappDaoFactory");
-            if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
-                log.debug("returning assertionsWebappDaoFactory from request attribute");
-                return (WebappDaoFactory) webappDaoFactoryAttr;     
-            } else {
-                log.debug("Returning assertionsWebappDaoFactory from context");
-                return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("assertionsWebappDaoFactory");
-            }
-        		
-        }
+    	return ModelAccess.on(this).getBaseWebappDaoFactory();
     }
-    
-    /** gets assertions-only WebappDaoFactory with no filtering */
-    public void setAssertionsWebappDaoFactory(WebappDaoFactory wadf) {
-        setAttribute("assertionsWebappDaoFactory", wadf); 
-    }
-    
-    /** gets inferences-only WebappDaoFactory with no filtering */
-    public WebappDaoFactory getDeductionsWebappDaoFactory() {
-    	Object webappDaoFactoryAttr = _req.getSession().getAttribute("deductionsWebappDaoFactory");
-        if (webappDaoFactoryAttr instanceof WebappDaoFactory) {
-             return (WebappDaoFactory) webappDaoFactoryAttr;
-        } else {
-        	return (WebappDaoFactory) _req.getSession().getServletContext().getAttribute("deductionsWebappDaoFactory");	
-        }
-    }
-    
+        
     //Method that retrieves write model, returns special model in case of write model
     public OntModel getWriteModel() {
     	//if special write model doesn't exist use get ont model 
@@ -173,73 +116,26 @@ public class VitroRequest extends HttpServletRequestWrapper {
     	}
     }
     
-    
+    public OntModelSelector getOntModelSelector() {
+    	return ModelAccess.on(this).getOntModelSelector();
+    }
     
     public OntModel getJenaOntModel() {
-    	Object ontModel = getAttribute("jenaOntModel");
-    	if (ontModel instanceof OntModel) {
-    		return (OntModel) ontModel;
-    	}
-    	OntModel jenaOntModel = (OntModel)_req.getSession().getAttribute( JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME );
-    	if ( jenaOntModel == null ) {
-    		jenaOntModel = (OntModel)_req.getSession().getServletContext().getAttribute( JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME );
-    	}
-    	return jenaOntModel;
+    	return ModelAccess.on(this).getJenaOntModel();
     }
     
-    public OntModelSelector getOntModelSelector() {
-        Object o = this.getAttribute("ontModelSelector");
-        if (o instanceof OntModelSelector) {
-            return (OntModelSelector) o;
-        } else {
-            return null;
-        }
-    }
-    
-    
+    /** JB - surprising that this comes from session. */
     public OntModel getAssertionsOntModel() {
-    	OntModel jenaOntModel = (OntModel)_req.getSession().getAttribute( JenaBaseDao.ASSERTIONS_ONT_MODEL_ATTRIBUTE_NAME );
-    	if ( jenaOntModel == null ) {
-    		jenaOntModel = (OntModel)_req.getSession().getServletContext().getAttribute( JenaBaseDao.ASSERTIONS_ONT_MODEL_ATTRIBUTE_NAME );
-    	}
-    	return jenaOntModel;    	
+        return ModelAccess.on(this.getSession()).getBaseOntModel();
     }
     
+    /** JB - surprising that this comes from session. */
     public OntModel getInferenceOntModel() {
-    	OntModel jenaOntModel = (OntModel)_req.getSession().getAttribute( JenaBaseDao.INFERENCE_ONT_MODEL_ATTRIBUTE_NAME );
-    	if ( jenaOntModel == null ) {
-    		jenaOntModel = (OntModel)_req.getSession().getServletContext().getAttribute( JenaBaseDao.INFERENCE_ONT_MODEL_ATTRIBUTE_NAME );
-    	}
-    	return jenaOntModel;    	
+    	return ModelAccess.on(this.getSession()).getInferenceOntModel();
     }
 
-    //Get the display and editing configuration model
-    public OntModel getDisplayModel(){     
-        //bdc34: I have no idea what the correct way to get this model is
-        
-        //try from the request
-        if( _req.getAttribute("displayOntModel") != null ){
-            return (OntModel) _req.getAttribute(DISPLAY_ONT_MODEL);
-                
-        //try from the session
-        } else {
-            HttpSession session = _req.getSession(false);
-            if( session != null ){
-                if( session.getAttribute(DISPLAY_ONT_MODEL) != null ){            
-                    return (OntModel) session.getAttribute(DISPLAY_ONT_MODEL);
-                    
-                //try from the context                    
-                }else{
-                    if( session.getServletContext().getAttribute(DISPLAY_ONT_MODEL) != null){
-                        return (OntModel)session.getServletContext().getAttribute(DISPLAY_ONT_MODEL); 
-                    }
-                }
-            }            
-        }
-        
-        //nothing worked, could not find display model
-        log.error("No display model could be found.");
-        return null;                
+    public OntModel getDisplayModel(){
+    	return ModelAccess.on(this).getDisplayModel();
     }
         
     /**
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java
index 674acf9cb..724c4e828 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/manageproxies/ajax/BasicProxiesGetter.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletResponse;
 
@@ -21,9 +20,8 @@ import com.hp.hpl.jena.query.QuerySolution;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryUtils;
 import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil;
@@ -60,9 +58,7 @@ public class BasicProxiesGetter extends AbstractAjaxResponder {
 		super(servlet, vreq, resp);
 		term = getStringParameter(PARAMETER_SEARCH_TERM, "");
 
-		ServletContext ctx = vreq.getSession().getServletContext();
-		OntModelSelector oms = ModelContext.getUnionOntModelSelector(ctx);
-		userAccountsModel = oms.getUserAccountsModel();
+		userAccountsModel = ModelAccess.on(vreq).getUserAccountsModel();
 
 		placeholderImageUrl = UrlBuilder.getUrl(PlaceholderUtil
 				.getPlaceholderImagePathForType(vreq,
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
index b16094631..13436c701 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
@@ -178,7 +178,7 @@ public abstract class UserAccountsMyAccountPageStrategy extends
 			FreemarkerEmailMessage email = FreemarkerEmailFactory
 					.createNewMessage(vreq);
 			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
-			email.setSubject(i18n.text("email_changed_subject"));
+			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
 			email.setTemplate(EMAIL_TEMPLATE);
 			email.setBodyMap(body);
 			email.processTemplate();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
index c773549f8..8432fc526 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
@@ -2,11 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.controller.ajax;
 
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 
 import java.io.IOException;
-import java.io.OutputStream;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -15,22 +13,14 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-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;
-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.query.Syntax;
 import com.hp.hpl.jena.rdf.model.Model;
 
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * Handle an AJAX request for a SPARQL query. On entry, the "query" parameter
@@ -86,29 +76,12 @@ public class SparqlQueryAjaxController extends VitroAjaxController {
 
 	}
 
-	private Model locateModel(VitroRequest vreq, String modelParam)
-			throws AjaxControllerException {
-		Object o = getServletContext().getAttribute("baseOntModelSelector");
-		if (!(o instanceof OntModelSelector)) {
-			throw new AjaxControllerException(SC_INTERNAL_SERVER_ERROR,
-					"OntModelSelector not found");
-		}
-		OntModelSelector oms = (OntModelSelector) o;
-
-		Model model = null;
+	private Model locateModel(VitroRequest vreq, String modelParam) {
 		if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) {
-			model = oms.getUserAccountsModel();
+			return ModelAccess.on(vreq).getUserAccountsModel();
 		} else {
-			// TODO What is the appropriate way to do this?
-			// model = oms.getFullModel();
-			model = vreq.getJenaOntModel();
+			return ModelAccess.on(vreq).getJenaOntModel();
 		}
-		if (model == null) {
-			throw new AjaxControllerException(SC_INTERNAL_SERVER_ERROR,
-					"Model '' not found.");
-		}
-
-		return model;
 	}
 
 	private String locateQueryParam(VitroRequest vreq)
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
index 39787c8ef..16435125b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
@@ -25,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent;
@@ -302,14 +303,7 @@ public class BasicAuthenticator extends Authenticator {
 		}
 
 		ServletContext servletContext = session.getServletContext();
-		WebappDaoFactory wadf = (WebappDaoFactory) servletContext
-				.getAttribute("webappDaoFactory");
-		if (wadf == null) {
-			log.error("no WebappDaoFactory");
-			return null;
-		}
-
-		return wadf;
+		return ModelAccess.on(servletContext).getWebappDaoFactory();
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index df1e5bbca..46af53601 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -39,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginRedirector;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginLogoutEvent;
 
 public class Authenticate extends VitroHttpServlet {
@@ -557,16 +558,7 @@ public class Authenticate extends VitroHttpServlet {
 			return;
 		}
 
-		OntModel jenaOntModel = (OntModel) session.getAttribute("jenaOntModel");
-		if (jenaOntModel == null) {
-			jenaOntModel = (OntModel) context.getAttribute("jenaOntModel");
-		}
-		if (jenaOntModel == null) {
-			log.error("Unable to notify audit model of login event "
-					+ "because no model could be found");
-			return;
-		}
-
+		OntModel jenaOntModel = ModelAccess.on(session).getJenaOntModel();
 		jenaOntModel.getBaseModel().notifyEvent(event);
 	}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
index 440848469..114ab1118 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
@@ -79,8 +79,7 @@ public class EntityRetryController extends BaseEditController {
         }
         
         LoginStatusBean loginBean = LoginStatusBean.getBean(request);
-        WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(
-                vreq, loginBean.getUserURI());
+        WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(loginBean.getUserURI());
 
         IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();
         epo.setDataAccessObject(ewDao);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
index 50e60642b..2015b88e5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/NamespacePrefixOperationController.java
@@ -24,6 +24,7 @@ import edu.cornell.mannlib.vedit.beans.EditProcessObject;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class NamespacePrefixOperationController extends BaseEditController {
@@ -68,7 +69,7 @@ public class NamespacePrefixOperationController extends BaseEditController {
         
         if (request.getParameter("_cancel") == null) {
         	
-        	OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+    		OntModel ontModel = ModelAccess.on(getServletContext()).getJenaOntModel();
         	String namespaceStr = request.getParameter("namespace");
         	String prefixStr = request.getParameter("prefix");
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
index 57596ac7d..60769e8d9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java
@@ -7,7 +7,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
@@ -40,7 +39,6 @@ import com.hp.hpl.jena.rdf.model.StmtIterator;
 import com.hp.hpl.jena.shared.InvalidPropertyURIException;
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.util.ResourceUtils;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 import com.hp.hpl.jena.vocabulary.RDF;
 
@@ -50,7 +48,8 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.EditEvent;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
@@ -74,7 +73,7 @@ public class RefactorOperationController extends BaseEditController {
         request.setAttribute("title","Check Datatype Properties");
         request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
         
-		OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+        OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
 		ontModel.enterCriticalSection(Lock.WRITE);
 		ArrayList<String> results = new ArrayList<String>();
 				
@@ -236,10 +235,10 @@ public class RefactorOperationController extends BaseEditController {
     			Model model = null;
     			
     			if (JenaDataSourceSetupBase.JENA_TBOX_ASSERTIONS_MODEL.equals(graphURI)) {
-    				model = ModelContext.getBaseOntModelSelector(getServletContext()).getTBoxModel();
+    				model = ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX);
     				doNotify = true;
     			} else if (JenaDataSourceSetupBase.JENA_DB_MODEL.equals(graphURI)) {
-					model = ModelContext.getBaseOntModelSelector(getServletContext()).getABoxModel();
+					model = ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_ABOX);
 					doNotify = true;
     			} else {
     			    model = dataset.getNamedModel(graphURI);
@@ -252,8 +251,7 @@ public class RefactorOperationController extends BaseEditController {
     		dataset.getLock().leaveCriticalSection();
     	}
 		
-		renameResourceInModel(ModelContext.getOntModelSelector(
-				getServletContext()).getUserAccountsModel(), 
+		renameResourceInModel(ModelAccess.on(getServletContext()).getUserAccountsModel(), 
 				        userURI, oldURIStr, newURIStr, !NOTIFY);
     	
 		// there are no statements to delete, but we want indexes updated appropriately
@@ -330,7 +328,7 @@ public class RefactorOperationController extends BaseEditController {
 	private void doMovePropertyStatements(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		String userURI = LoginStatusBean.getBean(request).getUserURI();
 		
-		OntModel ontModel = ModelContext.getBaseOntModel(getServletContext());
+		OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
 		
 		Model tempRetractModel = ModelFactory.createDefaultModel();
 		Model tempAddModel = ModelFactory.createDefaultModel();
@@ -414,7 +412,7 @@ public class RefactorOperationController extends BaseEditController {
 	private void doMoveInstances(VitroRequest request, HttpServletResponse response, EditProcessObject epo) {
 		String userURI = LoginStatusBean.getBean(request).getUserURI();
 		
-		OntModel ontModel = ModelContext.getBaseOntModel(getServletContext());
+		OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
 		
 		String oldClassURIStr = (String) epo.getAttribute("VClassURI");
 		String newClassURIStr = (String) request.getParameter("NewVClassURI");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
index 2bab7453e..2fdcc9cef 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java
@@ -27,6 +27,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
@@ -52,8 +53,8 @@ public class ClassHierarchyListingController extends BaseEditController {
         try {
         boolean inferred = (vrequest.getParameter("inferred") != null);
         
-        if (vrequest.getAssertionsWebappDaoFactory() != null && !inferred) {
-        	vcDao = vrequest.getAssertionsWebappDaoFactory().getVClassDao();
+        if (!inferred) {
+        	vcDao = ModelAccess.on(vrequest).getBaseWebappDaoFactory().getVClassDao();
         } else {
         	vcDao = vrequest.getFullWebappDaoFactory().getVClassDao();
         }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
index dda705e85..70845da91 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
@@ -22,6 +22,7 @@ import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class NamespacesListingController extends BaseEditController {
@@ -34,7 +35,7 @@ public class NamespacesListingController extends BaseEditController {
 
         VitroRequest vrequest = new VitroRequest(request);
                
-        OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+		OntModel ontModel = ModelAccess.on(getServletContext()).getJenaOntModel();
                
         ArrayList results = new ArrayList();
         request.setAttribute("results",results);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
index 1788dc42c..80dc8262f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
@@ -33,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
 
@@ -51,8 +52,8 @@ public class RestrictionsListingController extends BaseEditController {
 
         epo = super.createEpo(request);
         
-        OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
-        
+		OntModel ontModel = ModelAccess.on(getServletContext()).getJenaOntModel();
+
         ObjectPropertyDao opDao = vrequest.getFullWebappDaoFactory().getObjectPropertyDao();
         VClassDao vcDao = vrequest.getFullWebappDaoFactory().getVClassDao();
         IndividualDao iDao = vrequest.getFullWebappDaoFactory().getIndividualDao();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
index 39e408a76..cabce6eba 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
@@ -17,6 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.processEdit.EditN3Utils;
@@ -200,7 +201,7 @@ public class DeletePropertyController extends FreemarkerHttpServlet {
     
     	Individual object = EditConfigurationUtils.getIndividual(vreq, objectUri);
     	if(object == null) {
-    		WebappDaoFactory wadf = (WebappDaoFactory) vreq.getSession().getServletContext().getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(vreq.getSession().getServletContext()).getWebappDaoFactory();
     		object = wadf.getIndividualDao().getIndividualByURI(objectUri);
     	}
     	
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
index f43113d8a..80994386c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
@@ -303,7 +303,7 @@ public class UrlBuilder {
     }
     
     public static String urlEncode(String str) {
-        String encoding = "ISO-8859-1";
+        String encoding = "UTF-8";
         String encodedUrl = null;
         try {
             encodedUrl = URLEncoder.encode(str, encoding);
@@ -314,7 +314,7 @@ public class UrlBuilder {
     }
 
     public static String urlDecode(String str) {
-        String encoding = "ISO-8859-1";
+        String encoding = "UTF-8";
         String decodedUrl = null;
         try {
             decodedUrl = URLDecoder.decode(str, encoding);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
index 90d2398b1..3038521c6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java
@@ -18,12 +18,10 @@ import org.apache.commons.logging.LogFactory;
 
 import com.hp.hpl.jena.iri.IRI;
 import com.hp.hpl.jena.iri.IRIFactory;
-import com.hp.hpl.jena.iri.Violation;
 import com.hp.hpl.jena.ontology.AllValuesFromRestriction;
 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.OntResource;
 import com.hp.hpl.jena.ontology.Restriction;
 import com.hp.hpl.jena.query.Query;
 import com.hp.hpl.jena.query.QueryExecution;
@@ -35,11 +33,9 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Property;
 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 com.hp.hpl.jena.vocabulary.RDFS;
@@ -47,6 +43,7 @@ import com.hp.hpl.jena.vocabulary.RDFS;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 
 public class JenaAdminActions extends BaseEditController {
@@ -59,7 +56,7 @@ public class JenaAdminActions extends BaseEditController {
         if (iri.hasViolation(false) ) {
         	log.error("Bad URI: "+uri);
         	log.error( "Only well-formed absolute URIrefs can be included in RDF/XML output: "
-                 + ((Violation)iri.violations(false).next()).getShortMessage());
+                 + iri.violations(false).next().getShortMessage());
         	return true;
         } else {
         	return false;
@@ -71,8 +68,7 @@ public class JenaAdminActions extends BaseEditController {
     private static final String AKT_PORTAL = "http://www.aktors.org/ontology/portal#";
     
     private void copyStatements(Model src, Model dest, Resource subj, Property pred, RDFNode obj) {
-    	for (Iterator i = src.listStatements(subj,pred,obj); i.hasNext();) {
-    		Statement stmt = (Statement) i.next();
+    	for (Statement stmt : src.listStatements(subj,pred,obj).toList()) {
     		String subjNs = stmt.getSubject().getNameSpace();
     		if (subjNs == null || (! (subjNs.equals(VITRO) || subjNs.equals(AKT_SUPPORT) || subjNs.equals(AKT_PORTAL) ) ) ) {
     			if (stmt.getObject().isLiteral()) {
@@ -90,14 +86,11 @@ public class JenaAdminActions extends BaseEditController {
     
     /**
      * This doesn't really print just the TBox.  It takes a copy of the model, removes all the individuals, and writes the result.
-     * @param response
      */
     private void outputTbox(HttpServletResponse response) {
-        OntModel memoryModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+        OntModel memoryModel = ModelAccess.on(getServletContext()).getBaseOntModel();
         try {
         	OntModel tempOntModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
-        	Property DescriptionProp = ResourceFactory.createProperty(VitroVocabulary.DESCRIPTION_ANNOT);
-        	Property ExampleProp = ResourceFactory.createProperty(VitroVocabulary.EXAMPLE_ANNOT);
         	memoryModel.enterCriticalSection(Lock.READ);
         	try {
         		copyStatements(memoryModel,tempOntModel,null,RDF.type,OWL.Class);
@@ -109,8 +102,6 @@ public class JenaAdminActions extends BaseEditController {
         		copyStatements(memoryModel,tempOntModel,null,RDFS.domain,null);
         		copyStatements(memoryModel,tempOntModel,null,RDFS.range,null);
         		copyStatements(memoryModel,tempOntModel,null,OWL.inverseOf,null);
-        		//copyStatements(memoryModel,tempOntModel,null,DescriptionProp,null);
-        		//copyStatements(memoryModel,tempOntModel,null,ExampleProp,null);
         	} finally {
         		memoryModel.leaveCriticalSection();
         	}
@@ -130,28 +121,24 @@ public class JenaAdminActions extends BaseEditController {
     	Model taxonomyModel = ModelFactory.createDefaultModel();
     	try {
     		HashSet<Resource> typeSet = new HashSet<Resource>();
-    		for (Iterator classIt = ontModel.listStatements((Resource)null,RDF.type,(RDFNode)null); classIt.hasNext();) {
-    			Statement stmt = (Statement) classIt.next();
+    		for (Statement stmt : ontModel.listStatements((Resource)null,RDF.type,(RDFNode)null).toList()) {
     			if (stmt.getObject().isResource()) {
-    				Resource ontClass = (Resource) stmt.getObject();
-    				typeSet.add(ontClass);
+    				typeSet.add((Resource) stmt.getObject());
     			}
     		}
-    		for (Iterator classIt = ontModel.listClasses(); classIt.hasNext();) {
-    			Resource classRes = (Resource) classIt.next();
+    		for (Resource classRes : ontModel.listClasses().toList()) {
     			typeSet.add(classRes);
     		}
-    		for (Iterator<Resource> typeIt = typeSet.iterator(); typeIt.hasNext();) {
-    			Resource ontClass = typeIt.next();
-	    			if (!ontClass.isAnon()) { // Only query for named classes
-	    				System.out.println("Describing "+ontClass.getURI());
-	    				// We want a subgraph describing this class, including related BNodes
-	    				String queryStr = "DESCRIBE <"+ontClass.getURI()+">";
-	    				Query describeQuery = QueryFactory.create(queryStr);
-	    				QueryExecution qe = QueryExecutionFactory.create(describeQuery,ontModel);
-	    				qe.execDescribe(taxonomyModel);
-	    			}
+    		for (Resource ontClass : typeSet) {
+    			if (!ontClass.isAnon()) { // Only query for named classes
+    				System.out.println("Describing "+ontClass.getURI());
+    				// We want a subgraph describing this class, including related BNodes
+    				String queryStr = "DESCRIBE <"+ontClass.getURI()+">";
+    				Query describeQuery = QueryFactory.create(queryStr);
+    				QueryExecution qe = QueryExecutionFactory.create(describeQuery,ontModel);
+    				qe.execDescribe(taxonomyModel);
     			}
+			}
     	} finally {
     		ontModel.leaveCriticalSection();
     	}
@@ -171,10 +158,10 @@ public class JenaAdminActions extends BaseEditController {
 	private String testWriteXML() {
 		StringBuffer output = new StringBuffer();
 		output.append("<html><head><title>Test Write XML</title></head><body><pre>\n");
-		Model model = (Model) getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(getServletContext()).getJenaOntModel();
 		Model tmp = ModelFactory.createDefaultModel();
 		boolean valid = true;
-		for (Statement stmt : ((List<Statement>)model.listStatements().toList()) ) {
+		for (Statement stmt : model.listStatements().toList() ) {
 			tmp.add(stmt);
 				StringWriter writer = new StringWriter();
 				try {
@@ -201,17 +188,15 @@ public class JenaAdminActions extends BaseEditController {
 
     private void printRestrictions() {
     	OntModel memoryModel = (OntModel) getServletContext().getAttribute("pelletOntModel");
-    	for (Iterator i = memoryModel.listRestrictions(); i.hasNext(); ) {
-    		Restriction rest = (Restriction) i.next();
+    	for (Restriction rest : memoryModel.listRestrictions().toList() ) {
     		//System.out.println();
     		if (rest.isAllValuesFromRestriction()) {
     			log.trace("All values from: ");
     			AllValuesFromRestriction avfr = rest.asAllValuesFromRestriction();
     			Resource res = avfr.getAllValuesFrom();
     			if (res.canAs(OntClass.class)) {
-    				OntClass resClass = (OntClass) res.as(OntClass.class);
-    				for (Iterator resInstIt = resClass.listInstances(); resInstIt.hasNext(); ) {
-    					Resource inst = (Resource) resInstIt.next();
+    				OntClass resClass = res.as(OntClass.class);
+    				for (Resource inst : resClass.listInstances().toList() ) {
     					log.trace("    -"+inst.getURI());
     				}
     			}
@@ -221,8 +206,7 @@ public class JenaAdminActions extends BaseEditController {
     			log.trace("Has value: ");
     		}
     		log.trace("On property "+rest.getOnProperty().getURI());
-    		for (Iterator indIt = rest.listInstances(); indIt.hasNext(); ) {
-    			Resource inst = (Resource) indIt.next();
+    		for (Resource inst : rest.listInstances().toList() ) {
     			log.trace("     "+inst.getURI());
     		}
     		
@@ -230,12 +214,11 @@ public class JenaAdminActions extends BaseEditController {
     }
     
     private void removeLongLiterals() {
-    	OntModel memoryModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+		OntModel memoryModel = ModelAccess.on(getServletContext()).getJenaOntModel();
     	memoryModel.enterCriticalSection(Lock.WRITE);
     	try {
     		List<Statement> statementsToRemove = new LinkedList<Statement>();
-    		for (Iterator i = memoryModel.listStatements(null,null,(Literal)null); i.hasNext(); ) {
-    			Statement stmt = (Statement) i.next();
+    		for (Statement stmt :  memoryModel.listStatements(null,null,(Literal)null).toList() ) {
     			if (stmt.getObject().isLiteral()) {
     				Literal lit = (Literal) stmt.getObject();
     				if ( lit.getString().length() > 24) {
@@ -252,7 +235,8 @@ public class JenaAdminActions extends BaseEditController {
     	}
     }
     
-    public void doGet(HttpServletRequest req, HttpServletResponse response) {
+    @Override
+	public void doGet(HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) {
         	return;
         }
@@ -273,17 +257,16 @@ public class JenaAdminActions extends BaseEditController {
 		}
         
         if (actionStr.equals("checkURIs")) { 
-        	OntModel memoryModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
-        	ClosableIterator stmtIt = memoryModel.listStatements();
+    		OntModel memoryModel = ModelAccess.on(getServletContext()).getJenaOntModel();
+        	StmtIterator stmtIt = memoryModel.listStatements();
         	try {
-	        	for (Iterator i = stmtIt; i.hasNext(); ) {
+        		for (Statement stmt : stmtIt.toList() ) {
 	        		boolean sFailed = false;
 	        		boolean pFailed = false;
 	        		boolean oFailed = false;
 	        		String sURI = "<bNode>";
 	        		String pURI = "???";
 	        		String oURI = "<bNode>";
-	        		Statement stmt = (Statement) i.next();
 	        		if (stmt.getSubject().getURI() != null) {
 	        			sFailed = checkURI(sURI = stmt.getSubject().getURI());
 	        		}
@@ -305,23 +288,19 @@ public class JenaAdminActions extends BaseEditController {
         if (actionStr.equals("output")) {
             OntModel memoryModel = null;
 	    if (request.getParameter("assertionsOnly") != null) {
-	    	memoryModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+	        memoryModel = ModelAccess.on(getServletContext()).getBaseOntModel();
 	    	System.out.println("baseOntModel");
 	    } else if (request.getParameter("inferences") != null) {
-	    	memoryModel = (OntModel) getServletContext().getAttribute("inferenceOntModel");
+	    	memoryModel = ModelAccess.on(getServletContext()).getInferenceOntModel();
 	    	System.out.println("inferenceOntModel");
 	    } else if (request.getParameter("pellet") != null) {
 	    	memoryModel = (OntModel) getServletContext().getAttribute("pelletOntModel");
 	    	System.out.println("pelletOntModel");
 	    } else {
-	    	memoryModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+			memoryModel = ModelAccess.on(getServletContext()).getJenaOntModel();
 	    	System.out.println("jenaOntModel");
 	    }  
-	    int subModelCount = 0;
-	    for (Iterator subIt = memoryModel.listSubModels(); subIt.hasNext();) {
-	    	subIt.next();
-	    	++subModelCount;
-	    }
+	    int subModelCount = memoryModel.listSubModels().toList().size();
 	    System.out.println("Submodels: "+subModelCount);
 	        try {
 	            //response.setContentType("application/rdf+xml");
@@ -339,42 +318,8 @@ public class JenaAdminActions extends BaseEditController {
         	removeLongLiterals();
         }
         
-        if (actionStr.equals("isIsomorphic")) {
-            OntModel memoryModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
-            OntModel persistentModel = (OntModel) getServletContext().getAttribute("jenaPersistentOntModel");
-            if ((memoryModel != null) && (persistentModel != null)) {
-                long startTime = System.currentTimeMillis();
-                if (memoryModel.isIsomorphicWith(persistentModel)) {
-                    log.trace("In-memory and persistent models are isomorphic");
-                } else {
-                    log.trace("In-memory and persistent models are NOT isomorphic");
-                    log.trace("In-memory model has "+memoryModel.size()+" statements");
-                    log.trace("Persistent model has "+persistentModel.size()+" statements");
-                    Model diff = memoryModel.difference(persistentModel);
-                    ClosableIterator stmtIt = diff.listStatements();
-                    log.trace("Delta = "+diff.size()+" statments");
-                    while (stmtIt.hasNext()) {
-                        Statement s = (Statement) stmtIt.next();
-                        try {
-                            log.trace(s.getSubject().getURI()+" : "+s.getPredicate().getURI()); // + ((Literal)s.getObject()).getString());
-                        } catch (ClassCastException cce) {}
-                    }
-                }
-                log.trace((System.currentTimeMillis()-startTime)/1000+" seconds to check isomorphism");
-            }
-        } else if (actionStr.equals("removeUntypedResources")) {
-            OntModel memoryModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
-            OntModel persistentModel = (OntModel) getServletContext().getAttribute("jenaPersistentOntModel");
-            ClosableIterator rIt = memoryModel.listSubjects();
-            clean(rIt,memoryModel);
-            ClosableIterator oIt = memoryModel.listObjects();
-            clean(oIt,memoryModel);
-            ClosableIterator rrIt = persistentModel.listSubjects();
-            clean(rIt,persistentModel);
-            ClosableIterator ooIt = persistentModel.listObjects();
-            clean(oIt,persistentModel);
-        } else if (actionStr.equals("outputTaxonomy")) {
-        	OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+        if (actionStr.equals("outputTaxonomy")) {
+            OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
         	Model taxonomyModel = extractTaxonomy(ontModel);
         	try {
         		taxonomyModel.write(response.getOutputStream());
@@ -385,32 +330,8 @@ public class JenaAdminActions extends BaseEditController {
     }
 
 
-    private void clean(ClosableIterator rIt, OntModel model) {
-        try {
-            while (rIt.hasNext()) {
-                try {
-                    OntResource r = (OntResource) rIt.next();
-                    try {
-                        Resource t = r.getRDFType();
-                        if (t == null) {
-                            r.remove();
-                        }
-                    } catch (Exception e) {
-                        r.remove();
-                    }
-                } catch (ClassCastException cce) {
-                    Resource r = (Resource) rIt.next();
-                    model.removeAll(r,null,null);
-                    model.removeAll(null,null,r);
-                }
-            }
-        } finally {
-            rIt.close();
-        }
-    }
-
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response) {
+    @Override
+	public void doPost(HttpServletRequest request, HttpServletResponse response) {
         doGet(request ,response);
     }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
index ab666c61f..b034ea5d9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaExportController.java
@@ -5,8 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.controller.jena;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,8 +28,9 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
@@ -121,8 +120,7 @@ public class JenaExportController extends BaseEditController {
 		if( "abox".equals(subgraphParam)){
 			model = ModelFactory.createDefaultModel();
 			if("inferred".equals(assertedOrInferredParam)){
-				model = ModelContext.getInferenceOntModelSelector(
-						getServletContext()).getABoxModel();
+				model = ModelAccess.on(getServletContext()).getOntModel(ModelID.INFERRED_ABOX);
 			}
 			else if("full".equals(assertedOrInferredParam)){
 			    outputSparqlConstruct(ABOX_FULL_CONSTRUCT, formatParam, response);
@@ -137,10 +135,9 @@ public class JenaExportController extends BaseEditController {
 		        // so we'll extract the whole ontology and then include
 		        // only those statements that are in the inferred graph
 		        Model tempModel = xutil.extractTBox(
-		                ModelContext.getUnionOntModelSelector(
-		                        getServletContext()).getTBoxModel(), ontologyURI);
-		        Model inferenceModel = ModelContext.getInferenceOntModelSelector(
-                        getServletContext()).getTBoxModel();
+		        		ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX),
+		                ontologyURI);
+		        Model inferenceModel = ModelAccess.on(getServletContext()).getOntModel(ModelID.INFERRED_TBOX);
 		        inferenceModel.enterCriticalSection(Lock.READ);
 		        try {
     		        model = tempModel.intersection(inferenceModel);
@@ -149,12 +146,11 @@ public class JenaExportController extends BaseEditController {
 		        }
 		    } else if ("full".equals(assertedOrInferredParam)) {
                 model = xutil.extractTBox(
-                        ModelContext.getUnionOntModelSelector(
-                                getServletContext()).getTBoxModel(), ontologyURI);		        
+                		ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX),
+                        ontologyURI);		        
 		    } else {
                 model = xutil.extractTBox(
-                        ModelContext.getBaseOntModelSelector(
-                                getServletContext()).getTBoxModel(), ontologyURI);              		        
+                        ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX), ontologyURI);              		        
 		    }
 			
 		}
@@ -162,10 +158,8 @@ public class JenaExportController extends BaseEditController {
 			if("inferred".equals(assertedOrInferredParam)){
 				ontModel = xutil.extractTBox(
 						dataset, ontologyURI, INFERENCE_GRAPH);
-				ontModel.addSubModel(ModelContext.getInferenceOntModelSelector(
-						getServletContext()).getABoxModel());
-				ontModel.addSubModel(ModelContext.getInferenceOntModelSelector(
-						getServletContext()).getTBoxModel());
+				ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(ModelID.INFERRED_ABOX));
+				ontModel.addSubModel(ModelAccess.on(getServletContext()).getOntModel(ModelID.INFERRED_TBOX));
 			}
 			else if("full".equals(assertedOrInferredParam)){
 			    outputSparqlConstruct(FULL_FULL_CONSTRUCT, formatParam, response);
@@ -283,9 +277,6 @@ public class JenaExportController extends BaseEditController {
 		}
 	}
 	
-	static final String FULL_ONT_MODEL_ATTR = "jenaOntModel";
-	static final String ASSERTIONS_ONT_MODEL_ATTR = "baseOntModel";
-	static final String INFERENCES_ONT_MODEL_ATTR = "inferenceOntModel";
 	static final String FULL_GRAPH = "?g";
 	static final String ASSERTIONS_GRAPH = "<http://vitro.mannlib.cornell.edu/default/vitro-kb-2>";
 	static final String INFERENCE_GRAPH = "<http://vitro.mannlib.cornell.edu/default/vitro-kb-inf>";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
index 6d1b2c346..2fe7d3e6f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java
@@ -67,8 +67,9 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker;
@@ -79,8 +80,8 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.ChangeSet;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+import edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
-import edu.cornell.mannlib.vitro.webapp.servlet.setup.WebappDaoSetup;
 import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils;
 import edu.cornell.mannlib.vitro.webapp.utils.jena.JenaIngestUtils.MergeResult;
@@ -520,7 +521,7 @@ public class JenaIngestController extends BaseEditController {
             vreq.setAttribute("title", "Choose Workflow Step");
             vreq.setAttribute("bodyJsp", WORKFLOW_STEP_JSP);
         } else {
-            OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+    		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
             jenaOntModel.enterCriticalSection(Lock.READ);
             List<Individual> savedQueryList = new LinkedList<Individual>();
             try {
@@ -537,7 +538,7 @@ public class JenaIngestController extends BaseEditController {
     
     private void processExecuteSparqlRequest(VitroRequest vreq, ModelMaker maker, String modelType) {
         String sparqlQueryStr = vreq.getParameter("sparqlQueryStr");
-        OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
         jenaOntModel.enterCriticalSection(Lock.READ);
         List<Individual> savedQueryList = new LinkedList<Individual>();
         try {
@@ -660,10 +661,8 @@ public class JenaIngestController extends BaseEditController {
               /*
                * get baseOnt and infOnt models
                */
-              OntModel baseOntModel = ModelContext.getBaseOntModel(
-                      getServletContext());
-              OntModel tboxOntModel = ModelContext.getUnionOntModelSelector(
-                      getServletContext()).getTBoxModel();
+              OntModel baseOntModel = ModelAccess.on(getServletContext()).getBaseOntModel();
+              OntModel tboxOntModel = ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX);
               
               /*
                * calling method that does the merge operation.
@@ -826,10 +825,10 @@ public class JenaIngestController extends BaseEditController {
             return;
         }
         Model m = modelMaker.getModel(modelName);
-        ModelContext.getBaseOntModelSelector(getServletContext()).getTBoxModel().addSubModel(m);
-        ModelContext.getBaseOntModelSelector(getServletContext()).getABoxModel().addSubModel(m);
-        ModelContext.getUnionOntModelSelector(getServletContext()).getABoxModel().addSubModel(m);
-        ModelContext.getUnionOntModelSelector(getServletContext()).getTBoxModel().addSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_ABOX).addSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX).addSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_ABOX).addSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX).addSubModel(m);
         attachedModels.put(modelName, m);
         log.info("Attached " + modelName + " (" + m.hashCode() + ") to webapp");
     }
@@ -839,10 +838,10 @@ public class JenaIngestController extends BaseEditController {
         if (m == null) {
             return;
         }
-        ModelContext.getBaseOntModelSelector(getServletContext()).getTBoxModel().removeSubModel(m);
-        ModelContext.getBaseOntModelSelector(getServletContext()).getABoxModel().removeSubModel(m);
-        ModelContext.getUnionOntModelSelector(getServletContext()).getABoxModel().removeSubModel(m);
-        ModelContext.getUnionOntModelSelector(getServletContext()).getTBoxModel().removeSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_ABOX).removeSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.BASE_TBOX).removeSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_ABOX).removeSubModel(m);
+        ModelAccess.on(getServletContext()).getOntModel(ModelID.UNION_TBOX).removeSubModel(m);
         attachedModels.remove(modelName);
         log.info("Detached " + modelName + " (" + m.hashCode() + ") from webapp");
     }
@@ -910,7 +909,7 @@ public class JenaIngestController extends BaseEditController {
     }
     
     private long doExecuteSparql(VitroRequest vreq) {
-        OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
         OntModel source = null;
         if ("pellet".equals(vreq.getParameter("reasoning"))) {
             source = ModelFactory.createOntologyModel(PelletReasonerFactory.THE_SPEC);
@@ -984,7 +983,7 @@ public class JenaIngestController extends BaseEditController {
         log.debug("Connecting to DB at "+jdbcUrl);
         StoreDesc storeDesc = new StoreDesc(LayoutType.LayoutTripleNodesHash,dbTypeObj) ; 
         ServletContext ctx = vreq.getSession().getServletContext();
-        DataSource bds = WebappDaoSetup.makeBasicDataSource(
+        DataSource bds = ContentModelSetup.makeBasicDataSource(
                 driver, jdbcUrl, username, password, ctx);
         try {
             VitroJenaSDBModelMaker vsmm = new VitroJenaSDBModelMaker(storeDesc, bds);
@@ -1193,8 +1192,7 @@ public class JenaIngestController extends BaseEditController {
             Model baseOntModel = RDFServiceGraph.createRDFServiceModel
                     (new RDFServiceGraph(
                             rdfService, JenaDataSourceSetupBase.JENA_DB_MODEL));
-            OntModel ontModel = (OntModel)
-            getServletContext().getAttribute("jenaOntModel");
+    		OntModel ontModel = ModelAccess.on(getServletContext()).getJenaOntModel();
             List<String> urisToChange = new LinkedList<String>();        
             ontModel.enterCriticalSection(Lock.READ);
             try {
@@ -1312,26 +1310,11 @@ public class JenaIngestController extends BaseEditController {
 
     public static Model getModel(String name, HttpServletRequest request, ServletContext context) {
         if ("vitro:jenaOntModel".equals(name)) {
-            Object sessionOntModel = request.getSession().getAttribute("jenaOntModel");
-            if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-                return (OntModel) sessionOntModel;
-            } else {
-                return (OntModel) context.getAttribute("jenaOntModel");
-            }
+            return ModelAccess.on(request.getSession()).getJenaOntModel();
         } else if ("vitro:baseOntModel".equals(name)) {
-            Object sessionOntModel = request.getSession().getAttribute("baseOntModel");
-            if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-                return (OntModel) sessionOntModel;
-            } else {
-                return (OntModel) context.getAttribute("baseOntModel");
-            }
+            return ModelAccess.on(request.getSession()).getBaseOntModel();
         } else if ("vitro:inferenceOntModel".equals(name)) {
-            Object sessionOntModel = request.getSession().getAttribute("inferenceOntModel");
-            if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-                return (OntModel) sessionOntModel;
-            } else {
-                return (OntModel) context.getAttribute("inferenceOntModel");
-            }
+        	return ModelAccess.on(request.getSession()).getInferenceOntModel();
         } else {
             return getVitroJenaModelMaker(request,context).getModel(name);
         }
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 ab7052233..7d7fd8459 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
@@ -34,9 +34,10 @@ import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 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.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.event.BulkUpdateEvent;
@@ -170,14 +171,12 @@ public class RDFUploadController extends JenaIngestController {
 
             JenaModelUtils xutil = new JenaModelUtils();
             
-            OntModel tboxModel = getTBoxModel(
-                    request.getSession(), getServletContext());
+            OntModel tboxModel = getTBoxModel(request.getSession());
             OntModel aboxModel = getABoxModel(
                     request.getSession(), getServletContext());
             OntModel tboxChangeModel = null;
             Model aboxChangeModel = null;
-            OntModelSelector ontModelSelector = ModelContext.getOntModelSelector(
-                    getServletContext());
+            OntModelSelector ontModelSelector = ModelAccess.on(getServletContext()).getOntModelSelector();
             
             if (tboxModel != null) {
                 boolean AGGRESSIVE = true;
@@ -428,17 +427,8 @@ public class RDFUploadController extends JenaIngestController {
          return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, abox);
      }    
 
-     private OntModel getTBoxModel(HttpSession session, ServletContext ctx) {   
-         if (session != null 
-                 && session.getAttribute("baseOntModelSelector")
-                         instanceof OntModelSelector) {
-             return ((OntModelSelector) 
-                     session.getAttribute("baseOntModelSelector"))
-                     .getTBoxModel();   
-         } else {
-             return ((OntModelSelector) 
-                     ctx.getAttribute("baseOntModelSelector")).getTBoxModel();
-         }
+     private OntModel getTBoxModel(HttpSession session) { 
+    	 return ModelAccess.on(session).getOntModel(ModelID.BASE_TBOX);
      }    
      
     private static final Log log = LogFactory.getLog(
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
index 5d5defc36..4a832d784 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DisplayVocabulary.java
@@ -115,13 +115,6 @@ public class DisplayVocabulary {
     public static final String USE_TBOX_MODEL_PARAM = "useThisTboxModel";
     public static final String USE_DISPLAY_MODEL_PARAM = "useThisDisplayModel";
     
-    //Attribute values used to store display tbox/display display model in servlet context
-    public static final String CONTEXT_DISPLAY_TBOX = "displayOntModelTBOX";
-    public static final String CONTEXT_DISPLAY_DISPLAY = "displayOntModelDisplayModel";
-    
-    /** Key for display model in request, session or context attributes */
-    public static final String DISPLAY_ONT_MODEL = "displayOntModel";
-    
     //URL for menu management
     public static final String PROCESS_MENU_MANAGEMENT_URL = "/menuManagementEdit";
     public static final String REORDER_MENU_URL = PROCESS_MENU_MANAGEMENT_URL + "?cmd=Reorder&" + SWITCH_TO_DISPLAY_MODEL + "=true";
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
new file mode 100644
index 000000000..66204b310
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
@@ -0,0 +1,323 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.EnumMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+
+/**
+ * Hierarchical storage for models. TODO
+ * 
+ * Could this be extended? Could it be used to replace or implement these
+ * methods?
+ * 
+ * <pre>
+ * VitroRequest.getAssertionsWebappDaoFactory()
+ * VitroRequest.getFullWebappDaoFactory()
+ * VitroRequest.getRDFService()
+ * VitroRequest.getUnfilteredRDFService()
+ * VitroRequest.getWebappDaoFactory()
+ * VitroRequest.getWriteModel()
+ * vreq.setUnfilteredWebappDaoFactory(wadf);
+ * 
+ * OntModelSelector.getABoxModel
+ * OntModelSelector.getFullModel()
+ * OntModelSelector.getTBoxModel()
+ * VitroModelSource.getModel(URL)
+ * VitroModelSource.getModel(URL, loadIfAbsent)
+ * VitroModelSource.openModel(name)
+ * VitroModelSource.openModelIfPresent(string)
+ * ServletContext.getAttribute("jenaPersistentOntModel")
+ * ServletContext.getAttribute("pelletOntModel")
+ * VitroJenaModelMaker
+ * VitroJenaSpecialModelMaker
+ * JenaDataSourceSetupBase.getApplicationDataSource(ctx)
+ * JenaDataSourceSetupBase.getStartupDataset()
+ * HttpSession.getAttribute("jenaAuditModel")
+ * </pre>
+ */
+
+public class ModelAccess {
+	private static final Log log = LogFactory.getLog(ModelAccess.class);
+
+	/** These attributes should only be accessed through this class. */
+	private static final String ATTRIBUTE_NAME = ModelAccess.class.getName();
+
+	public enum ModelID {
+		APPLICATION_METADATA,
+
+		USER_ACCOUNTS,
+
+		DISPLAY, DISPLAY_DISPLAY, DISPLAY_TBOX,
+
+		BASE_ABOX, BASE_TBOX, BASE_FULL,
+
+		INFERRED_ABOX, INFERRED_TBOX, INFERRED_FULL,
+
+		UNION_ABOX, UNION_TBOX, UNION_FULL
+	}
+
+	public enum FactoryID {
+		BASE, UNION
+	}
+
+	private enum Scope {
+		CONTEXT, SESSION, REQUEST
+	}
+
+	// ----------------------------------------------------------------------
+	// Factory methods
+	// ----------------------------------------------------------------------
+
+	public static ModelAccess on(HttpServletRequest req) {
+		Object o = req.getAttribute(ATTRIBUTE_NAME);
+		if (o instanceof ModelAccess) {
+			return (ModelAccess) o;
+		} else {
+			ModelAccess parent = on(req.getSession());
+			ModelAccess ma = new ModelAccess(Scope.REQUEST, parent);
+			req.setAttribute(ATTRIBUTE_NAME, ma);
+			return ma;
+		}
+	}
+
+	public static ModelAccess on(HttpSession session) {
+		Object o = session.getAttribute(ATTRIBUTE_NAME);
+		if (o instanceof ModelAccess) {
+			return (ModelAccess) o;
+		} else {
+			ModelAccess parent = on(session.getServletContext());
+			ModelAccess ma = new ModelAccess(Scope.SESSION, parent);
+			session.setAttribute(ATTRIBUTE_NAME, ma);
+			return ma;
+		}
+	}
+
+	public static ModelAccess on(ServletContext ctx) {
+		Object o = ctx.getAttribute(ATTRIBUTE_NAME);
+		if (o instanceof ModelAccess) {
+			return (ModelAccess) o;
+		} else {
+			ModelAccess ma = new ModelAccess(Scope.CONTEXT, null);
+			ctx.setAttribute(ATTRIBUTE_NAME, ma);
+			return ma;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// The instance
+	// ----------------------------------------------------------------------
+
+	private final Scope scope;
+	private final ModelAccess parent;
+	private final Map<ModelID, OntModel> modelMap = new EnumMap<>(ModelID.class);
+	private final Map<FactoryID, WebappDaoFactory> factoryMap = new EnumMap<>(
+			FactoryID.class);
+
+	public ModelAccess(Scope scope, ModelAccess parent) {
+		this.scope = scope;
+		this.parent = parent;
+	}
+
+	// ----------------------------------------------------------------------
+	// Accessing the models
+	// ----------------------------------------------------------------------
+
+	public OntModel getApplicationMetadataModel() {
+		return getOntModel(ModelID.APPLICATION_METADATA);
+	}
+
+	public void setUserAccountsModel(OntModel m) {
+		setOntModel(ModelID.USER_ACCOUNTS, m);
+	}
+
+	public OntModel getUserAccountsModel() {
+		return getOntModel(ModelID.USER_ACCOUNTS);
+	}
+
+	public void setDisplayModel(OntModel m) {
+		setOntModel(ModelID.DISPLAY, m);
+	}
+
+	public OntModel getDisplayModel() {
+		return getOntModel(ModelID.DISPLAY);
+	}
+
+	public void setJenaOntModel(OntModel m) {
+		setOntModel(ModelID.UNION_FULL, m);
+	}
+
+	public OntModel getJenaOntModel() {
+		return getOntModel(ModelID.UNION_FULL);
+	}
+
+	public void setBaseOntModel(OntModel m) {
+		setOntModel(ModelID.BASE_FULL, m);
+	}
+
+	public OntModel getBaseOntModel() {
+		return getOntModel(ModelID.BASE_FULL);
+	}
+
+	public OntModel getInferenceOntModel() {
+		return getOntModel(ModelID.INFERRED_FULL);
+	}
+
+	public void setOntModel(ModelID id, OntModel ontModel) {
+		if (ontModel == null) {
+			modelMap.remove(id);
+		} else {
+			modelMap.put(id, ontModel);
+		}
+	}
+
+	public void removeOntModel(ModelID id) {
+		setOntModel(id, null);
+	}
+
+	public OntModel getOntModel(ModelID id) {
+		if (modelMap.containsKey(id)) {
+			log.debug("Using " + id + " model from " + scope);
+			return modelMap.get(id);
+		} else if (parent != null) {
+			return parent.getOntModel(id);
+		} else {
+			log.warn("No model found for " + id);
+			return null;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Accessing the Webapp DAO factories.
+	// ----------------------------------------------------------------------
+
+	public void setWebappDaoFactory(WebappDaoFactory wadf) {
+		setWebappDaoFactory(FactoryID.UNION, wadf);
+	}
+
+	public WebappDaoFactory getWebappDaoFactory() {
+		return getWebappDaoFactory(FactoryID.UNION);
+	}
+
+	public void setBaseWebappDaoFactory(WebappDaoFactory wadf) {
+		setWebappDaoFactory(FactoryID.BASE, wadf);
+	}
+
+	public WebappDaoFactory getBaseWebappDaoFactory() {
+		return getWebappDaoFactory(FactoryID.BASE);
+	}
+
+	public void setWebappDaoFactory(FactoryID id, WebappDaoFactory wadf) {
+		if (wadf == null) {
+			factoryMap.remove(id);
+		} else {
+			factoryMap.put(id, wadf);
+		}
+	}
+
+	public void removeWebappDaoFactory(FactoryID id) {
+		setWebappDaoFactory(id, null);
+	}
+
+	public WebappDaoFactory getWebappDaoFactory(FactoryID id) {
+		if (factoryMap.containsKey(id)) {
+			log.debug("Using " + id + " DAO factory from " + scope);
+			return factoryMap.get(id);
+		} else if (parent != null) {
+			return parent.getWebappDaoFactory(id);
+		} else {
+			log.warn("No DAO factory found for " + id);
+			return null;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Accessing the OntModelSelectors
+	// ----------------------------------------------------------------------
+
+	public OntModelSelector getOntModelSelector() {
+		return getUnionOntModelSelector();
+	}
+
+	public OntModelSelector getBaseOntModelSelector() {
+		return new FacadeOntModelSelector(this, ModelID.BASE_ABOX,
+				ModelID.BASE_TBOX, ModelID.BASE_FULL);
+	}
+
+	public OntModelSelector getInferenceOntModelSelector() {
+		return new FacadeOntModelSelector(this, ModelID.INFERRED_ABOX,
+				ModelID.INFERRED_TBOX, ModelID.INFERRED_FULL);
+	}
+
+	public OntModelSelector getUnionOntModelSelector() {
+		return new FacadeOntModelSelector(this, ModelID.UNION_ABOX,
+				ModelID.UNION_TBOX, ModelID.UNION_FULL);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	/**
+	 * This OntModelSelector doesn't actually hold any OntModels. Instead, it
+	 * links back to the ModelAccess that it was created from. So, if you change
+	 * a model on the ModelAccess, it will change on the OntModelSelector also.
+	 * Even if the OntModelSelector was created first.
+	 */
+	private static class FacadeOntModelSelector implements OntModelSelector {
+		private final ModelAccess parent;
+		private final ModelID aboxID;
+		private final ModelID tboxID;
+		private final ModelID fullID;
+
+		public FacadeOntModelSelector(ModelAccess parent, ModelID aboxID,
+				ModelID tboxID, ModelID fullID) {
+			this.parent = parent;
+			this.aboxID = aboxID;
+			this.tboxID = tboxID;
+			this.fullID = fullID;
+		}
+
+		@Override
+		public OntModel getABoxModel() {
+			return parent.getOntModel(aboxID);
+		}
+
+		@Override
+		public OntModel getTBoxModel() {
+			return parent.getOntModel(tboxID);
+		}
+
+		@Override
+		public OntModel getFullModel() {
+			return parent.getOntModel(fullID);
+		}
+
+		@Override
+		public OntModel getApplicationMetadataModel() {
+			return parent.getOntModel(ModelID.APPLICATION_METADATA);
+		}
+
+		@Override
+		public OntModel getUserAccountsModel() {
+			return parent.getOntModel(ModelID.USER_ACCOUNTS);
+		}
+
+		@Override
+		public OntModel getDisplayModel() {
+			return parent.getOntModel(ModelID.DISPLAY);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
index 93d52f2ac..34bd23d46 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDao.java
@@ -41,7 +41,7 @@ public interface ObjectPropertyStatementDao {
     public Map<String, String> getMostSpecificTypesInClassgroupsForIndividual(String subjectUri);
 
 	List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-			String subjectUri, String propertyUri, String objectKey,
+			String subjectUri, String propertyUri, String objectKey, String rangeUri,
 			String queryString, Set<String> constructQueryStrings,
 			String sortDirection);
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
index 5f09c5188..de7c93438 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/ObjectPropertyStatementDaoFiltering.java
@@ -86,12 +86,12 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
 	
     @Override
     public List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-            String subjectUri, String propertyUri, String objectKey, String query, 
-            Set<String> queryStrings, String sortDirection) {
+            String subjectUri, String propertyUri, String objectKey, String rangeUri,
+            String query, Set<String> queryStrings, String sortDirection) {
         
         List<Map<String, String>> data = 
         	innerObjectPropertyStatementDao.getObjectPropertyStatementsForIndividualByProperty(
-        			subjectUri, propertyUri, objectKey, query, queryStrings,sortDirection);
+        			subjectUri, propertyUri, objectKey, rangeUri, query, queryStrings,sortDirection);
         
         /* Filter the data
          * 
@@ -105,6 +105,10 @@ class ObjectPropertyStatementDaoFiltering extends BaseFiltering implements Objec
         for (Map<String, String> map : data) {
             String objectUri = map.get(objectKey);
             ObjectPropertyStatement statement = new ObjectPropertyStatementImpl(subjectUri, propertyUri, objectUri);
+            ObjectProperty op = new ObjectProperty();
+            op.setURI(propertyUri);
+            op.setRangeVClassURI(rangeUri);
+            statement.setProperty(op);
             stmtsToData.put(statement, map);
         }
         
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
index bec886cd9..6e8fe09d1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao.java
@@ -54,10 +54,6 @@ public class JenaBaseDao extends JenaBaseDaoCon {
 	public static final boolean KEEP_ONLY_IF_TRUE = true; //used for updatePropertyBooleanValue()
     public static final boolean KEEP_ONLY_IF_FALSE = false; //used for updatePropertyBooleanValue()
     
-    public static final String JENA_ONT_MODEL_ATTRIBUTE_NAME = "jenaOntModel";
-    public static final String ASSERTIONS_ONT_MODEL_ATTRIBUTE_NAME = "baseOntModel";
-    public static final String INFERENCE_ONT_MODEL_ATTRIBUTE_NAME = "inferenceOntModel";
-    
     protected static final Log log = LogFactory.getLog(JenaBaseDao.class.getName());
     
     /* ******************* static constants ****************** */
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
index 57d835a4c..120de2b2a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ModelContext.java
@@ -7,84 +7,14 @@ import javax.servlet.ServletContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.ModelChangedListener;
 
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 public class ModelContext {
-    
     private static final Log log = LogFactory.getLog(ModelContext.class);
 	
-	private static final String ONT_MODEL_SELECTOR = "ontModelSelector";
-	private static final String UNION_ONT_MODEL_SELECTOR = "unionOntModelSelector";
-	private static final String BASE_ONT_MODEL_SELECTOR = "baseOntModelSelector";
-	private static final String INFERENCE_ONT_MODEL_SELECTOR = "inferenceOntModelSelector";
-	
-	private static final String JENA_ONT_MODEL = "jenaOntModel";
-	private static final String BASE_ONT_MODEL = "baseOntModel";
-	private static final String INFERENCE_ONT_MODEL = "inferenceOntModel";
-
-	public ModelContext() {}
-	
-	public static OntModelSelector getOntModelSelector(ServletContext ctx) {
-		return (OntModelSelector) ctx.getAttribute(ONT_MODEL_SELECTOR);
-	}
-	
-	public static void setOntModelSelector(OntModelSelector oms, ServletContext ctx) {
-		ctx.setAttribute(ONT_MODEL_SELECTOR, oms); 
-	}
-	
-	public static OntModelSelector getUnionOntModelSelector(ServletContext ctx) {
-		return (OntModelSelector) ctx.getAttribute(UNION_ONT_MODEL_SELECTOR);
-	}
-	
-	public static void setUnionOntModelSelector(OntModelSelector oms, ServletContext ctx) {
-		ctx.setAttribute(UNION_ONT_MODEL_SELECTOR, oms); 
-	}
- 	
-	public static OntModelSelector getBaseOntModelSelector(ServletContext ctx) {
-		return (OntModelSelector) ctx.getAttribute(BASE_ONT_MODEL_SELECTOR);
-	}
-	
-	public static void setBaseOntModelSelector(OntModelSelector oms, ServletContext ctx) {
-		ctx.setAttribute(BASE_ONT_MODEL_SELECTOR, oms); 
-	}
-	
-	public static OntModelSelector getInferenceOntModelSelector(ServletContext ctx) {
-		return (OntModelSelector) ctx.getAttribute(INFERENCE_ONT_MODEL_SELECTOR);
-	}
-	
-	public static void setInferenceOntModelSelector(OntModelSelector oms, ServletContext ctx) {
-		ctx.setAttribute(INFERENCE_ONT_MODEL_SELECTOR, oms); 
-	}
-	
-	public static OntModel getJenaOntModel(ServletContext ctx) {
-		return (OntModel) ctx.getAttribute(JENA_ONT_MODEL);
-	}
-	
-	public static void setJenaOntModel(OntModel ontModel, ServletContext ctx) {
-		ctx.setAttribute(JENA_ONT_MODEL, ontModel);
-	}
-	
-	public static OntModel getBaseOntModel(ServletContext ctx) {
-		return (OntModel) ctx.getAttribute(BASE_ONT_MODEL);
-	}
-	
-	public static void setBaseOntModel(OntModel ontModel, ServletContext ctx) {
-		ctx.setAttribute(BASE_ONT_MODEL, ontModel);
-	}
-	
-	public static OntModel getInferenceOntModel(ServletContext ctx) {
-		return (OntModel) ctx.getAttribute(INFERENCE_ONT_MODEL);
-	}
-	
-	public static void setInferenceOntModel(OntModel ontModel, ServletContext ctx) {
-		ctx.setAttribute(INFERENCE_ONT_MODEL, ontModel);
-	}
-	
 	/**
 	 * Register a listener to the models needed to get changes to:
 	 *   Basic abox statemetns:
@@ -113,10 +43,4 @@ public class ModelContext {
         
 	}
 	
-	public static OntModel getDisplayModel(ServletContext ctx){
-	    return(OntModel) ctx.getAttribute( DisplayVocabulary.DISPLAY_ONT_MODEL );	    
-	}
-	public static void setDisplayModel(OntModel ontModel, ServletContext ctx){
-	    ctx.setAttribute(DisplayVocabulary.DISPLAY_ONT_MODEL,ontModel);	    
-	}
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
index 1b0e54dbd..3bfae5f3c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java
@@ -27,6 +27,7 @@ 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.Literal;
 import com.hp.hpl.jena.rdf.model.Property;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Resource;
@@ -38,6 +39,7 @@ 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 com.hp.hpl.jena.sdb.util.Pair;
 
 import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
@@ -859,12 +861,16 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
         }           
     }
     
-    Map<ObjectProperty, String> customListViewConfigFileMap = null;
+    //TODO private void addPropertyClassCombinationsToListViewMap(HashMap)    
+    
+    // Map key is pair of object property and range class URI
+    // If range is unspecified, OWL.Thing.getURI() is used in the key.
+    Map<Pair<ObjectProperty, String>, String> customListViewConfigFileMap = null;
     
     @Override
     public String getCustomListViewConfigFileName(ObjectProperty op) {
         if (customListViewConfigFileMap == null) {
-            customListViewConfigFileMap = new HashMap<ObjectProperty, String>();
+            customListViewConfigFileMap = new HashMap<Pair<ObjectProperty, String>, String>();
             OntModel displayModel = getOntModelSelector().getDisplayModel();
             //Get all property to list view config file mappings in the system
             QueryExecution qexec = QueryExecutionFactory.create(listViewConfigFileQuery, displayModel); 
@@ -883,12 +889,18 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp
                 	}
                 } else {
                     String filename = soln.getLiteral("filename").getLexicalForm();
-                    customListViewConfigFileMap.put(prop, filename);     
+                    customListViewConfigFileMap.put(new Pair<ObjectProperty, String>(prop, OWL.Thing.getURI()), filename);     
                 }
             }       
             qexec.close();
-        }        
-        return customListViewConfigFileMap.get(op);
+        }      
+        
+        String customListViewConfigFileName = customListViewConfigFileMap.get(new Pair<ObjectProperty, String>(op, op.getRangeVClassURI()));
+        if (customListViewConfigFileName == null) {
+            customListViewConfigFileName = customListViewConfigFileMap.get(new Pair<ObjectProperty, String>(op, OWL.Thing.getURI()));
+        }
+        
+        return customListViewConfigFileName;
     }
 
 }
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 1a1e3cf87..073c1189f 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
@@ -271,6 +271,7 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
             String subjectUri, 
             String propertyUri,             
             String objectKey, 
+            String rangeUri,
             String queryString, 
             Set<String> constructQueryStrings,
             String sortDirection) {    	        
@@ -296,6 +297,9 @@ public class ObjectPropertyStatementDaoJena extends JenaBaseDao implements Objec
         QuerySolutionMap initialBindings = new QuerySolutionMap();
         initialBindings.add("subject", ResourceFactory.createResource(subjectUri));
         initialBindings.add("property", ResourceFactory.createResource(propertyUri));
+        if (rangeUri != null) {
+            initialBindings.add("objectType", ResourceFactory.createResource(rangeUri));
+        }
         
         // Run the SPARQL query to get the properties
         List<Map<String, String>> list = new ArrayList<Map<String, String>>();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
index e5aa2f68b..63d4d1446 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelector.java
@@ -35,13 +35,9 @@ public interface OntModelSelector {
 	 * @return OntModel containing all TBox axioms
 	 */
 	public OntModel getTBoxModel();
-
+	
 	/**
-	 * @param ontologyURI
-	 * @return OntModel containing TBox axioms for the specified ontology
+	 * @return OntModel containing all RDF statements in the Display model.
 	 */
-	public OntModel getTBoxModel(String ontologyURI);
-	
 	public OntModel getDisplayModel();
-	
 }
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
index 673ebdc91..a80d064f2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/OntModelSelectorImpl.java
@@ -38,11 +38,6 @@ public class OntModelSelectorImpl implements OntModelSelector {
 		return this.tboxModel;
 	}
 
-	@Override
-	public OntModel getTBoxModel(String ontologyURI) {
-		return this.tboxModel;
-	}
-
 	@Override
 	public OntModel getUserAccountsModel() {
 		return this.userAccountsModel;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
index 7564dc891..f3d150ac3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/SimpleOntModelSelector.java
@@ -89,26 +89,27 @@ public class SimpleOntModelSelector implements OntModelSelector {
 		this.fullModel = m;
 	}
 	
+	@Override
 	public OntModel getABoxModel() {
 		return aboxModel;
 	}
 	
+	@Override
 	public OntModel getApplicationMetadataModel() {
 		return applicationMetadataModel;
 	}
 
+	@Override
 	public OntModel getFullModel() {
 		return fullModel;
 	}
 
+	@Override
 	public OntModel getTBoxModel() {
 		return tboxModel;
 	}
 
-	public OntModel getTBoxModel(String ontologyURI) {
-		return tboxModel;
-	}
-
+	@Override
 	public OntModel getUserAccountsModel() {
 		return userAccountsModel;
 	}
@@ -120,6 +121,7 @@ public class SimpleOntModelSelector implements OntModelSelector {
 	public void setDisplayModel(OntModel displayModel) {
 		this.displayModel = displayModel;		
 	}
+	@Override
 	public OntModel getDisplayModel(){
 		return this.displayModel;
 	}
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
index cbcd7c298..abe8d0bbd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassDaoSDB.java
@@ -2,6 +2,7 @@
 
 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;
@@ -13,9 +14,11 @@ 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.Property;
 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.RDF;
@@ -53,9 +56,9 @@ public class VClassDaoSDB extends VClassDaoJena {
         try {
             if ((group != null) && (group.getURI() != null)) {                                
                 Resource groupRes = ResourceFactory.createResource(group.getURI());
-                AnnotationProperty inClassGroup = getOntModel().getAnnotationProperty(VitroVocabulary.IN_CLASSGROUP);
+                Property inClassGroup = ResourceFactory.createProperty(VitroVocabulary.IN_CLASSGROUP);
                 if (inClassGroup != null) {
-                    ClosableIterator annotIt = getOntModel().listStatements((OntClass)null,inClassGroup,groupRes);
+                    StmtIterator annotIt = getOntModel().listStatements((Resource)null,inClassGroup, groupRes);
                     try {
                         while (annotIt.hasNext()) {
                             try {
@@ -91,7 +94,7 @@ public class VClassDaoSDB extends VClassDaoJena {
                                     	Model aboxModel = getOntModelSelector().getABoxModel();
                                     	aboxModel.enterCriticalSection(Lock.READ);
                                     	try {
-	                                        ClosableIterator countIt = aboxModel.listStatements(null,RDF.type,cls);
+	                                        StmtIterator countIt = aboxModel.listStatements(null,RDF.type,cls);
 	                                        try {
 	                                            if (countIt.hasNext()) {
 	                                            	classIsInstantiated = true;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
index 40e0eaddd..55c2c127c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VClassGroupCache.java
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
@@ -173,12 +174,7 @@ public class VClassGroupCache implements IndexingEventListener {
     }
 
     protected VClassGroupDao getVCGDao() {
-        WebappDaoFactory wdf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
-        if (wdf == null) {
-            log.error("Cannot get webappDaoFactory from context");
-            return null;
-        } else
-            return wdf.getVClassGroupDao();
+		return ModelAccess.on(context).getWebappDaoFactory().getVClassGroupDao();
     }
     
     public void doSynchronousRebuild(){
@@ -241,12 +237,9 @@ public class VClassGroupCache implements IndexingEventListener {
      */
     protected static void rebuildCacheUsingSolr( VClassGroupCache cache ) throws SolrServerException{                        
         long start = System.currentTimeMillis();
-        WebappDaoFactory wdFactory = (WebappDaoFactory) cache.context.getAttribute("webappDaoFactory");
-        if (wdFactory == null){ 
-            log.error("Unable to rebuild cache: could not get 'webappDaoFactory' from Servletcontext");
-            return;
-        }        
-        SolrServer solrServer = (SolrServer)cache.context.getAttribute(SolrSetup.SOLR_SERVER);
+		WebappDaoFactory wdFactory = ModelAccess.on(cache.context).getWebappDaoFactory();
+
+		SolrServer solrServer = (SolrServer)cache.context.getAttribute(SolrSetup.SOLR_SERVER);
         if( solrServer == null){
             log.error("Unable to rebuild cache: could not get solrServer from ServletContext");
             return;
@@ -494,7 +487,7 @@ public class VClassGroupCache implements IndexingEventListener {
             } else if(VitroVocabulary.DISPLAY_RANK.equals(stmt.getPredicate().getURI())){
             	requestCacheUpdate();
             } else {
-                OntModel jenaOntModel = ModelContext.getJenaOntModel(context);
+                OntModel jenaOntModel = ModelAccess.on(context).getJenaOntModel();
                 if( isClassNameChange(stmt, jenaOntModel) ) {            
                     requestCacheUpdate();
                 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaModelMaker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaModelMaker.java
index d2ed5b30f..1f4c087cd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaModelMaker.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaModelMaker.java
@@ -27,6 +27,7 @@ import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 import com.hp.hpl.jena.util.iterator.WrappedIterator;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
 /**
@@ -311,28 +312,11 @@ public class VitroJenaModelMaker implements ModelMaker {
 	private Model getSpecialModel(String modelName) {
 		if (request != null) {
 			if ("vitro:jenaOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("jenaOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					log.debug("Returning jenaOntModel from session");
-					return (OntModel) sessionOntModel;
-				} else {
-					log.debug("Returning jenaOntModel from context");
-					return (OntModel) request.getSession().getServletContext().getAttribute("jenaOntModel");
-				}
+	    		return ModelAccess.on(request.getSession()).getJenaOntModel();
 			} else if ("vitro:baseOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("baseOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					return (OntModel) sessionOntModel;
-				} else {
-					return (OntModel) request.getSession().getServletContext().getAttribute("baseOntModel");
-				}
+		        return ModelAccess.on(request.getSession()).getBaseOntModel();
 			} else if ("vitro:inferenceOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("inferenceOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					return (OntModel) sessionOntModel;
-				} else {
-					return (OntModel) request.getSession().getServletContext().getAttribute("inferenceOntModel");
-				}
+				return ModelAccess.on(request.getSession()).getInferenceOntModel();
 			} else {
 				return null;
 			}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java
index 1feb261f9..58247d3e8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroJenaSpecialModelMaker.java
@@ -8,12 +8,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import com.hp.hpl.jena.graph.GraphMaker;
-import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelMaker;
 import com.hp.hpl.jena.rdf.model.ModelReader;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+
 /**
  * Wraps a model maker and returns Models from the servlet context when 
  * certain model URIs are requested
@@ -115,28 +116,11 @@ public class VitroJenaSpecialModelMaker implements ModelMaker {
 	private Model getSpecialModel(String modelName) {
 		if (request != null) {
 			if ("vitro:jenaOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("jenaOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					log.debug("Returning jenaOntModel from session");
-					return (OntModel) sessionOntModel;
-				} else {
-					log.debug("Returning jenaOntModel from context");
-					return (OntModel) request.getSession().getServletContext().getAttribute("jenaOntModel");
-				}
+				return ModelAccess.on(request.getSession()).getJenaOntModel();
 			} else if ("vitro:baseOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("baseOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					return (OntModel) sessionOntModel;
-				} else {
-					return (OntModel) request.getSession().getServletContext().getAttribute("baseOntModel");
-				}
+		        return ModelAccess.on(request.getSession()).getBaseOntModel();
 			} else if ("vitro:inferenceOntModel".equals(modelName)) {
-				Object sessionOntModel = request.getSession().getAttribute("inferenceOntModel");
-				if (sessionOntModel != null && sessionOntModel instanceof OntModel) {
-					return (OntModel) sessionOntModel;
-				} else {
-					return (OntModel) request.getSession().getServletContext().getAttribute("inferenceOntModel");
-				}
+				return ModelAccess.on(request.getSession()).getInferenceOntModel();
 			} else {
 				return null;
 			}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
index 2366777cb..d41df3011 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/VitroModelSource.java
@@ -9,7 +9,8 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelReader;
 import com.hp.hpl.jena.rdf.model.ModelSource;
 
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 
 /** 
  * ModelSource that will handle specially named Vitro models such
@@ -106,15 +107,15 @@ public class VitroModelSource implements ModelSource {
     private Model getNamedModel( ModelName pmn ){
         switch( pmn ){
             case ABOX: 
-                return (Model) context.getAttribute("jenaOntModel");
+            	return ModelAccess.on(context).getJenaOntModel();
             case TBOX:
                 return (Model) context.getAttribute("tboxmodel???");
             case DISPLAY:
-                return (Model) context.getAttribute(DisplayVocabulary.DISPLAY_ONT_MODEL );
+            	return ModelAccess.on(context).getDisplayModel();
             case DISPLAY_TBOX:
-                return (Model) context.getAttribute(DisplayVocabulary.CONTEXT_DISPLAY_TBOX);
+                return ModelAccess.on(context).getOntModel(ModelID.DISPLAY_TBOX);
             case DISPLAY_DISPLAY:
-                return (Model) context.getAttribute(DisplayVocabulary.CONTEXT_DISPLAY_DISPLAY);
+                return ModelAccess.on(context).getOntModel(ModelID.DISPLAY_DISPLAY);
             case USER_ACCOUNTS:
                 throw new IllegalArgumentException("getNamedModel() Does not yet handle USER_ACCOUNTS");
             default:
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
index d04f44d9a..c3872f70f 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dwr/EntityDWR.java
@@ -2,10 +2,7 @@
 
 package edu.cornell.mannlib.vitro.webapp.dwr;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -18,7 +15,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
 import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
    This is a class to support Direct Web Remoting(DWR) in
@@ -31,7 +28,7 @@ public class EntityDWR {
     public EntityDWR(){
         WebContext ctx = WebContextFactory.get();
         ServletContext sc= ctx.getServletContext();
-        entityWADao = ((WebappDaoFactory)sc.getAttribute("webappDaoFactory")).getIndividualDao();
+        entityWADao =  ModelAccess.on(sc).getWebappDaoFactory().getIndividualDao();
     }
 
     /**
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
index a88aa24b4..896d2518b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
@@ -14,8 +14,8 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
 
 import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
@@ -23,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
@@ -189,7 +190,7 @@ public class EditConfigurationUtils {
     public static DataPropertyStatement getDataPropertyStatement(VitroRequest vreq, HttpSession session, Integer dataHash, String predicateUri) {
     	DataPropertyStatement dps = null;
    	    if( dataHash != 0) {
-   	        Model model = (Model)session.getServletContext().getAttribute("jenaOntModel");
+   			OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
    	        dps = RdfLiteralHash.getPropertyStmtByHash(EditConfigurationUtils.getSubjectUri(vreq), predicateUri, dataHash, model);   	        
    	    }
    	    return dps;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
index 47c0d19d2..2fecd1063 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/StandardModelSelector.java
@@ -10,35 +10,15 @@ import org.apache.commons.logging.LogFactory;
 
 import com.hp.hpl.jena.ontology.OntModel;
 
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 
 public class StandardModelSelector implements ModelSelector {
 
     private static final Log log = LogFactory.getLog(StandardModelSelector.class);
     
     public OntModel getModel(HttpServletRequest request, ServletContext context) {
-        VitroRequest vreq = new VitroRequest( request );        
-        
-        Object sessionOntModel = null;
-        if( vreq.getSession() != null) {
-            OntModelSelector oms = (OntModelSelector) vreq.getSession()
-            							.getAttribute("unionOntModelSelector");
-            if (oms != null) {
-            	sessionOntModel = oms.getABoxModel();
-            }
-        }
-        if(sessionOntModel != null && sessionOntModel instanceof OntModel ) {
-            log.debug("using OntModelSelector from session");
-            return (OntModel)sessionOntModel;
-        } else if (vreq.getOntModelSelector() != null) {
-            log.debug("using OntModelSelector from request");
-            return vreq.getOntModelSelector().getABoxModel();
-        } else {
-            log.debug("using OntModelSelector from context");
-            return ((OntModelSelector) context
-            			.getAttribute("unionOntModelSelector")).getABoxModel();
-        }
+    	return ModelAccess.on(request.getSession()).getOntModel(ModelID.UNION_ABOX);
     }
     
     public static final ModelSelector selector = new StandardModelSelector();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
index 80adcecd0..0599081bd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/BaseEditConfigurationGenerator.java
@@ -4,8 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
@@ -13,13 +11,11 @@ import org.apache.commons.lang.StringUtils;
 import com.hp.hpl.jena.ontology.OntModel;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.IdModelSelector;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.ModelSelector;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardModelSelector;
-import edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep;
 
 public abstract class BaseEditConfigurationGenerator implements EditConfigurationGenerator {
 
@@ -66,7 +62,7 @@ public abstract class BaseEditConfigurationGenerator implements EditConfiguratio
         //setup the model selectors for query, write and display models on editConfig
         setupModelSelectorsFromVitroRequest(vreq, editConfig);        
         
-        OntModel queryModel = vreq.getJenaOntModel(); // (OntModel)vreq.getAttribute("jenaOntModel");
+        OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
         
         if( editConfig.getSubjectUri() == null)
             editConfig.setSubjectUri( EditConfigurationUtils.getSubjectUri(vreq));
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
index ca2f7b74a..6b24a1825 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
@@ -14,6 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 
@@ -21,6 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
@@ -350,7 +352,7 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from 
-    	Model model = (Model) session.getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
 	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
index a6ea9e704..757238aec 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java
@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.*;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -24,13 +22,13 @@ import org.apache.solr.common.SolrDocumentList;
 
 import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
@@ -377,7 +375,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from 
-    	Model model = (Model) session.getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
     	//if object property
     	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
 	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
@@ -408,16 +406,11 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
     	if(isSelectFromExisting(vreq)) {
     		// set ProhibitedFromSearch object so picklist doesn't show
             // individuals from classes that should be hidden from list views
-    		//TODO: Check how model is retrieved
-            OntModel displayOntModel = 
-               (OntModel) session.getServletContext()
-                    .getAttribute(DISPLAY_ONT_MODEL);
-            if (displayOntModel != null) {
-                ProhibitedFromSearch pfs = new ProhibitedFromSearch(
-                    DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel);
-                if( editConfig != null )
-                    editConfig.setProhibitedFromSearch(pfs);
-            }
+            OntModel displayOntModel = ModelAccess.on(session.getServletContext()).getDisplayModel();
+            ProhibitedFromSearch pfs = new ProhibitedFromSearch(
+                DisplayVocabulary.SEARCH_INDEX_URI, displayOntModel);
+            if( editConfig != null )
+                editConfig.setProhibitedFromSearch(pfs);
     	}
     }
     
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
index 225d086ed..6517520fd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
@@ -33,6 +33,7 @@ import com.hp.hpl.jena.vocabulary.XSD;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
@@ -207,7 +208,7 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
 	  void prepare(VitroRequest vreq, EditConfigurationVTwo editConfig) {
 	        //setup the model selectors for query, write and display models on editConfig
 	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
-	        OntModel queryModel = (OntModel)vreq.getAttribute("jenaOntModel");
+			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
 	        if (editConfig.isParamUpdate()) { 
 	        	editConfig.prepareForParamUpdate(queryModel);
 	        	
@@ -224,7 +225,7 @@ public class ManagePageGenerator extends BaseEditConfigurationGenerator implemen
         if (editConfig.isParamUpdate()) { 
         	 //setup the model selectors for query, write and display models on editConfig
 	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
-	        OntModel queryModel = (OntModel)vreq.getAttribute("jenaOntModel");
+			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
         	retrieveExistingDataGetterInfo(context, editConfig, queryModel);
         }
 		
@@ -589,7 +590,8 @@ private String getExistingIsSelfContainedTemplateQuery() {
 		int maxMenuPosition = 0;
 		Literal menuPosition = null;
 		setupModelSelectorsFromVitroRequest(vreq, editConfig);         
-	    OntModel queryModel = (OntModel)vreq.getAttribute("jenaOntModel");
+		OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
+
 		String maxMenuPositionQuery = getMaxMenuPositionQueryString();
     	QueryExecution qe = null;
         try{
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
index 0c0adcdde..ba5b640ab 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
@@ -10,13 +10,14 @@ import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
+import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.vocabulary.RDFS;
 import com.hp.hpl.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
@@ -239,7 +240,7 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from 
-    	Model model = (Model) session.getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
     	//This form is always doing a non-update
     	editConfiguration.prepareForNonUpdate( model );
 	      
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
index 764f2f7b4..7dc24a5be 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
@@ -13,6 +13,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.vocabulary.XSD;
@@ -21,6 +22,7 @@ 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.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
@@ -297,7 +299,7 @@ public class RDFSLabelGenerator implements EditConfigurationGenerator {
 
 	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
     	//Here, retrieve model from 
-    	Model model = (Model) session.getServletContext().getAttribute("jenaOntModel");
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
 		if( editConfiguration.isDataPropertyUpdate() ){
     		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());	
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
new file mode 100644
index 000000000..9fc4186a7
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/CachingResponseFilter.java
@@ -0,0 +1,354 @@
+/* $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.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+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 javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.EnumerationUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.FieldMap;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrResultsParser;
+
+/**
+ * Assist in cache management for individual profile pages.
+ * 
+ * Only works for users who are not logged in.
+ * 
+ * The Solr index must be configured to keep an ETAG on each individual's
+ * record. The ETAG is a hash of the record's content and is updated each time
+ * the individual is re-indexed.
+ * 
+ * But this ETAG is not sufficient, since the page may have different versions
+ * for different languages. So we append a hash of the Locales from the request
+ * to the ETAG to make it unique. NOTE: If we allow users to choose their
+ * preferred languages, the LocalSelectionFilter must execute before this one.
+ * 
+ * When an external cache (e.g. Squid) is asked for an individual's profile
+ * page, it will ask VIVO whether the version in the cache is still current, and
+ * to provide a new version if it is not. This is a conditional request.
+ * 
+ * When a conditional request is received, this filter will check to see whether
+ * the request is on behalf of a logged-in user. If so, a fresh response is
+ * generated, with a Cache-Control header that should prevent the cache from
+ * storing that response.
+ * 
+ * If the requesting user is not logged in, this filter will ask Solr for the
+ * ETAG on the requested individual. If it is the same as the ETAG supplied by
+ * the cache in the request, then the response is 304 Not Modified. Otherwise, a
+ * fresh response is generated.
+ * 
+ * An unconditional request may mean that there is no external cache, or that
+ * the cache doesn't have a copy of this particular page.
+ * 
+ * @see http://tools.ietf.org/pdf/rfc2616
+ */
+public class CachingResponseFilter implements Filter {
+	private static final Log log = LogFactory
+			.getLog(CachingResponseFilter.class);
+
+	private static final String PROPERTY_DEFAULT_NAMESPACE = "Vitro.defaultNamespace";
+	private static final String ETAG_FIELD = "etag";
+
+	private static final FieldMap parserFieldMap = SolrQueryUtils.fieldMap()
+			.put(ETAG_FIELD, ETAG_FIELD);
+
+	private ServletContext ctx;
+	private String defaultNamespace;
+
+	@Override
+	public void init(FilterConfig fc) throws ServletException {
+		ctx = fc.getServletContext();
+		defaultNamespace = ConfigurationProperties.getBean(ctx).getProperty(
+				PROPERTY_DEFAULT_NAMESPACE);
+	}
+
+	@Override
+	public void destroy() {
+		// Nothing to tear down.
+	}
+
+	/**
+	 * Process an HTTP request.
+	 */
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletRequest req = (HttpServletRequest) request;
+		HttpServletResponse resp = (HttpServletResponse) response;
+
+		/*
+		 * If this request is not for a profile page, or if the individual
+		 * doesn't appear in the search index, create a basic, cache-neutral
+		 * response.
+		 */
+		String individualUri = figureIndividualUriFromRequest(req);
+		if (individualUri == null) {
+			produceBasicResponse(req, resp, chain);
+			return;
+		}
+		String rawEtag = findEtagForIndividual(individualUri);
+		String etag = produceLanguageSpecificEtag(req, rawEtag);
+		if (etag == null) {
+			produceBasicResponse(req, resp, chain);
+			return;
+		}
+
+		/*
+		 * If a logged-in user asks for an individual profile page, the response
+		 * should not come from the cache, nor should it be stored in the cache.
+		 */
+		if (userIsLoggedIn(req)) {
+			produceUncacheableResponse(req, resp, chain);
+			return;
+		}
+
+		/*
+		 * If the request is not conditional then there is no cached version of
+		 * this page. If the request is conditional and the condition is met,
+		 * then the cached version is stale. In either case, create a fresh
+		 * response to be stored in the cache.
+		 */
+		if (!isConditionalRequest(req)) {
+			produceCacheableResponse(req, resp, chain, etag);
+			return;
+		}
+		if (cacheIsStale(req, etag)) {
+			produceCacheableResponse(req, resp, chain, etag);
+			return;
+		}
+
+		/*
+		 * If the request is conditional and the condition is not met
+		 * (individual has not changed), send a "not-modified" response, so the
+		 * cached version will be used.
+		 */
+		produceCacheHitResponse(resp, etag);
+	}
+
+	private boolean isConditionalRequest(HttpServletRequest req) {
+		if (req.getHeader("If-None-Match") == null) {
+			log.debug("Not conditional request.");
+			return false;
+		} else {
+			log.debug("Conditional request.");
+			return true;
+		}
+	}
+
+	private boolean userIsLoggedIn(HttpServletRequest req) {
+		UserAccount currentUser = LoginStatusBean.getCurrentUser(req);
+		if (currentUser == null) {
+			log.debug("Not logged in.");
+			return false;
+		} else {
+			log.debug("Logged in as '" + currentUser.getEmailAddress() + "'");
+			return true;
+		}
+	}
+
+	/**
+	 * This rejects some of the requests as being obviously not individuals, and
+	 * then assumes that the last part of any request is a Localname.
+	 * 
+	 * This is not always true, of course, but it will work because we will
+	 * prepend the default namespace and look for the resulting "URI" in the URI
+	 * field of the search index. If we find it there, then it is valid.
+	 * 
+	 * If we were to make this more rigorous, it would reduce the number of
+	 * unnecessary searches.
+	 */
+	private String figureIndividualUriFromRequest(HttpServletRequest req) {
+		String requestPath = req.getRequestURI();
+		if (requestPath == null) {
+			return null;
+		}
+
+		if (!mightBeProfileRequest(requestPath)) {
+			return null;
+		}
+
+		String[] pathParts = requestPath.split("/");
+		String uri = defaultNamespace + pathParts[pathParts.length - 1];
+
+		log.debug("Request path = '" + requestPath + "', uri = '" + uri + "'");
+		return uri;
+	}
+
+	/**
+	 * Requests for profile pages come in many forms, but we can still narrow
+	 * them down.
+	 * 
+	 * Eliminate CSS files, JavaScript files, and images.
+	 * 
+	 * That leaves these acceptable forms:
+	 * 
+	 * <pre>
+	 *     /individual?uri=urlencodedURI
+	 *     /individual?netId=bdc34
+	 *     /individual?netid=bdc34
+	 *     /individual/localname         
+	 *     /display/localname
+	 *     /individual/localname/localname.rdf
+	 *     /individual/localname/localname.n3
+	 *     /individual/localname/localname.ttl
+	 * </pre>
+	 */
+	private boolean mightBeProfileRequest(String requestPath) {
+		String path = requestPath.toLowerCase();
+		String[] extensions = { ".css", ".js", ".gif", ".png", ".jpg", ".jpeg" };
+		for (String ext : extensions) {
+			if (path.endsWith(ext)) {
+				return false;
+			}
+		}
+		return requestPath.endsWith("/individual")
+				|| requestPath.contains("/individual/")
+				|| requestPath.contains("/display/");
+	}
+
+	/**
+	 * Ask Solr whether it has an ETAG for this URI.
+	 */
+	private String findEtagForIndividual(String individualUri) {
+		SolrQuery query = new SolrQuery("URI:" + individualUri)
+				.setFields(ETAG_FIELD);
+
+		SolrServer solr = SolrSetup.getSolrServer(ctx);
+
+		try {
+			QueryResponse response = solr.query(query);
+			List<Map<String, String>> maps = new SolrResultsParser(response,
+					parserFieldMap).parse();
+			log.debug("Solr response for '" + query.getQuery() + "' was "
+					+ maps);
+
+			if (maps.isEmpty()) {
+				return null;
+			} else {
+				return maps.get(0).get(ETAG_FIELD);
+			}
+		} catch (SolrServerException e) {
+			log.warn(
+					"Solr query '" + query.getQuery() + "' threw an exception",
+					e);
+			return null;
+		}
+	}
+
+	/**
+	 * The ETAG from the Solr index is not specific enough, since we may have
+	 * different versions for different languages. Add the Locales from the
+	 * request to make it unique.
+	 */
+	private String produceLanguageSpecificEtag(HttpServletRequest req,
+			String rawEtag) {
+		if (rawEtag == null) {
+			return null;
+		}
+
+		@SuppressWarnings("unchecked")
+		List<Locale> locales = EnumerationUtils.toList(req.getLocales());
+
+		StringBuilder buffer = new StringBuilder('"').append(rawEtag);
+		for (Locale locale : locales) {
+			buffer.append(locale.toString()).append(" ");
+		}
+		buffer.append('"');
+
+		String etag = buffer.toString();
+		log.debug("Language-specific ETAG = " + etag);
+		return etag;
+	}
+
+	/**
+	 * If the etag does not match any of the etags in any of the "If-None-Match"
+	 * headers, then they are all stale. An asterisk matches anything.
+	 */
+	private boolean cacheIsStale(HttpServletRequest req, String etag) {
+		for (Enumeration<?> values = req.getHeaders("If-None-Match"); values
+				.hasMoreElements();) {
+			String value = (String) values.nextElement();
+			log.debug("If-None-Match: " + value);
+
+			String[] matches = value.split("\\s*,\\s*");
+			for (String match : matches) {
+				if (etag.equalsIgnoreCase(match) || "*".equals(match)) {
+					log.debug("Cache is not stale: etag=" + match);
+					return false;
+				}
+			}
+		}
+		log.debug("Cache is stale.");
+		return true;
+	}
+
+	private void produceBasicResponse(HttpServletRequest req,
+			HttpServletResponse resp, FilterChain chain) throws IOException,
+			ServletException {
+		chain.doFilter(req, resp);
+	}
+
+	private void produceUncacheableResponse(HttpServletRequest req,
+			HttpServletResponse resp, FilterChain chain) throws IOException,
+			ServletException {
+		String etag = generateArbitraryUniqueEtag(req);
+		log.debug("Produce uncacheable response: etag='" + etag + "'");
+
+		resp.addHeader("ETag", etag);
+		resp.addHeader("Vary", "*");
+		resp.addHeader("Cache-Control", "no-store");
+		chain.doFilter(req, resp);
+	}
+
+	private void produceCacheableResponse(HttpServletRequest req,
+			HttpServletResponse resp, FilterChain chain, String etag)
+			throws IOException, ServletException {
+		log.debug("Produce cacheable response: etag='" + etag + "'");
+		resp.addHeader("ETag", etag);
+		resp.addHeader("Vary", "Accept-Language");
+		chain.doFilter(req, resp);
+	}
+
+	/**
+	 * Technically, if the request is not GET or HEAD, we should return 412
+	 * PreconditionFailed. However, we usually treat GET and POST as equivalent.
+	 */
+	private void produceCacheHitResponse(HttpServletResponse resp, String etag)
+			throws IOException {
+		log.debug("Produce cache hit response: etag='" + etag + "'");
+		resp.addHeader("ETag", etag);
+		resp.addHeader("Vary", "Accept-Language");
+		resp.sendError(HttpServletResponse.SC_NOT_MODIFIED, "Not Modified");
+	}
+
+	private String generateArbitraryUniqueEtag(HttpServletRequest req) {
+		return String.format("%s-%d", req.getSession().getId(),
+				System.currentTimeMillis());
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
index d4b9be61c..4c849338a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/PageRoutingFilter.java
@@ -11,6 +11,7 @@ import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -21,6 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.PageController;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 /**
@@ -52,7 +54,9 @@ public class PageRoutingFilter implements Filter{
     @Override
     public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain chain) 
         throws IOException, ServletException {        
-        PageDao pageDao = getPageDao();        
+        ServletContext ctx = filterConfig.getServletContext();
+        
+		PageDao pageDao = ModelAccess.on(ctx).getWebappDaoFactory().getPageDao();        
         Map<String,String> urlMappings = pageDao.getPageMappings();
         
         // get URL without hostname or servlet context
@@ -81,7 +85,7 @@ public class PageRoutingFilter implements Filter{
                 String controllerName = getControllerToForwardTo(req, pageUri, pageDao);            
                 log.debug(path + " is being forwarded to controller " + controllerName);
                 
-                RequestDispatcher rd = filterConfig.getServletContext().getNamedDispatcher( controllerName );
+                RequestDispatcher rd = ctx.getNamedDispatcher( controllerName );
                 if( rd == null ){
                     log.error(path + " should be forwarded to controller " + controllerName + " but there " +
                     		"is no servlet named that defined for the web application in web.xml");
@@ -91,7 +95,7 @@ public class PageRoutingFilter implements Filter{
                 rd.forward(req, response);
             }else if( "/".equals( path ) || path.isEmpty() ){
                 log.debug("url '" +path + "' is being forward to home controller" );
-                RequestDispatcher rd = filterConfig.getServletContext().getNamedDispatcher( HOME_CONTROLLER_NAME );            
+                RequestDispatcher rd = ctx.getNamedDispatcher( HOME_CONTROLLER_NAME );            
                 rd.forward(req, response);
             }else{
                 doNonDisplayPage(path,arg0,arg1,chain);
@@ -132,12 +136,6 @@ public class PageRoutingFilter implements Filter{
         return false;                
     }
     
-    protected PageDao getPageDao(){
-        WebappDaoFactory wdf = (WebappDaoFactory) 
-            filterConfig.getServletContext().getAttribute("webappDaoFactory");
-        return wdf.getPageDao();
-    }
-        
     @Override
     public void destroy() {
        //nothing to do here        
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
index 3ef123eb4..faa7f9ee2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 import freemarker.cache.WebappTemplateLoader;
@@ -116,8 +116,7 @@ public class StartupStatusDisplayFilter implements Filter {
 	private Object getApplicationName() {
 		String name = "";
 		try {
-			WebappDaoFactory wadf = (WebappDaoFactory) ctx
-					.getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			ApplicationBean app = wadf.getApplicationDao().getApplicationBean();
 			name = app.getApplicationName();
 		} catch (Exception e) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
index f52727c27..64d554c5b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/URLRewritingHttpServletResponse.java
@@ -8,7 +8,6 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 import javax.servlet.ServletContext;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
@@ -18,6 +17,7 @@ import org.apache.commons.logging.LogFactory;
 import org.openrdf.model.URI;
 import org.openrdf.model.impl.URIImpl;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapper;
 import edu.cornell.mannlib.vitro.webapp.utils.NamespaceMapperFactory;
@@ -36,7 +36,7 @@ public class URLRewritingHttpServletResponse extends HttpServletResponseWrapper/
 	    super(response);
 		this._response = response;
 		this._context = context;
-		this.wadf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
+		this.wadf =	ModelAccess.on(context).getWebappDaoFactory();
 		this.contextPathDepth = slashPattern.split(request.getContextPath()).length-1;
 	}
 		
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 f1d7a6e71..94ebb8628 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/VitroRequestPrep.java
@@ -3,8 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.filters;
 
 import static edu.cornell.mannlib.vitro.webapp.controller.VitroRequest.SPECIAL_WRITE_MODEL;
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.CONTEXT_DISPLAY_TBOX;
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL;
 import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL;
 import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.USE_DISPLAY_MODEL_PARAM;
 import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.USE_MODEL_PARAM;
@@ -41,15 +39,17 @@ import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.WebappDaoFactoryFiltering;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.FilterFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.HideFromDisplayByPolicyFilter;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase;
 
@@ -123,15 +123,16 @@ public class VitroRequestPrep implements Filter {
         VitroRequest vreq = new VitroRequest(req);
         
         //-- setup DAO factory --//
-        WebappDaoFactory wdf = getWebappDaoFactory(vreq);
-        //TODO: get accept-language from request and set as preferred languages
-        
-        // if there is a WebappDaoFactory in the session, use it
-    	Object o = req.getSession().getAttribute("webappDaoFactory");
-    	if (o instanceof WebappDaoFactory) {
-    		wdf = (WebappDaoFactory) o;
-    		log.debug("Found a WebappDaoFactory in the session and using it for this request");
-    	}
+        WebappDaoFactory wdf = ModelAccess.on(vreq.getSession()).getWebappDaoFactory();
+    	
+    	// Set up the DisplayModel with language filtering, if appropriate.
+		ConfigurationProperties props = ConfigurationProperties.getBean(req);
+		Boolean languageFilteringEnabled = Boolean.valueOf(props.getProperty("RDFService.languageFilter", "true"));
+		if (languageFilteringEnabled) {
+			OntModel displayModel = ModelAccess.on(req.getSession()).getDisplayModel();
+			OntModel filteredDisplayModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(displayModel, req);
+			ModelAccess.on(req).setDisplayModel(filteredDisplayModel);
+		}
     	
     	//Do model switching and replace the WebappDaoFactory with 
     	//a different version if requested by parameters
@@ -151,7 +152,7 @@ public class VitroRequestPrep implements Filter {
 		HideFromDisplayByPolicyFilter filter = new HideFromDisplayByPolicyFilter(
 				RequestIdentifiers.getIdBundleForRequest(req),
 				ServletPolicyList.getPolicies(_context));
-		vreq.setWebappDaoFactory(new WebappDaoFactoryFiltering(wdf, filter));
+		ModelAccess.on(vreq).setWebappDaoFactory(new WebappDaoFactoryFiltering(wdf, filter));
 		
         // support for Dataset interface if using Jena in-memory model
         if (vreq.getDataset() == null) {
@@ -165,21 +166,14 @@ public class VitroRequestPrep implements Filter {
         if (vreq.getUnfilteredWebappDaoFactory() == null) {
             vreq.setUnfilteredWebappDaoFactory(new WebappDaoFactorySDB(
                     RDFServiceUtils.getRDFServiceFactory(ctx).getRDFService(),
-                    ModelContext.getUnionOntModelSelector(
-                            ctx)));
+                    ModelAccess.on(ctx).getUnionOntModelSelector()));
         }
         
         req.setAttribute("VitroRequestPrep.setup", new Integer(1));
         chain.doFilter(req, response);
     }
 
-	private WebappDaoFactory getWebappDaoFactory(VitroRequest vreq){
-    	WebappDaoFactory webappDaoFactory = vreq.getWebappDaoFactory();
-        return (webappDaoFactory != null) ? webappDaoFactory :
-        	(WebappDaoFactory) _context.getAttribute("webappDaoFactory");
-    }
-
-    private VitroFilters getFiltersFromContextFilterFactory( HttpServletRequest request, WebappDaoFactory wdf){
+	private VitroFilters getFiltersFromContextFilterFactory( HttpServletRequest request, WebappDaoFactory wdf){
         FilterFactory ff = (FilterFactory)_context.getAttribute("FilterFactory");
         if( ff == null ){ 
             return null;
@@ -224,8 +218,8 @@ public class VitroRequestPrep implements Filter {
     	
     	// If they asked for the display model, give it to them.
 		if (isParameterPresent(vreq, SWITCH_TO_DISPLAY_MODEL)) {
-			OntModel mainOntModel = (OntModel)_context.getAttribute( DISPLAY_ONT_MODEL);
-			OntModel tboxOntModel = (OntModel) _context.getAttribute(CONTEXT_DISPLAY_TBOX);			
+			OntModel mainOntModel = ModelAccess.on(_context).getDisplayModel();
+			OntModel tboxOntModel = ModelAccess.on(_context).getOntModel(ModelID.DISPLAY_TBOX);
 	   		setSpecialWriteModel(vreq, mainOntModel);
 	   		
 	   		vreq.setAttribute(VitroRequest.ID_FOR_ABOX_MODEL, VitroModelSource.ModelName.DISPLAY.toString());
@@ -302,7 +296,7 @@ public class VitroRequestPrep implements Filter {
 	
 	private void setSpecialWriteModel(VitroRequest vreq, OntModel mainOntModel) {	    
 		if (mainOntModel != null) {    
-	        vreq.setAttribute("jenaOntModel", mainOntModel);
+			ModelAccess.on(vreq).setJenaOntModel(mainOntModel);
 			vreq.setAttribute(SPECIAL_WRITE_MODEL, mainOntModel);
 		}
 	}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
index 4bb7fda8e..f71008e91 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySDBPrep.java
@@ -3,10 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.filters;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.List;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -22,15 +19,16 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 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.Dataset;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
@@ -38,6 +36,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetM
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringRDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 
 public class WebappDaoFactorySDBPrep implements Filter {
@@ -83,23 +82,13 @@ public class WebappDaoFactorySDBPrep implements Filter {
             }
         }
 		
-        OntModelSelector oms = ModelContext.getUnionOntModelSelector(_ctx);
-        OntModelSelector baseOms = ModelContext.getBaseOntModelSelector(_ctx);
         String defaultNamespace = (String) _ctx.getAttribute("defaultNamespace");
 		WebappDaoFactory wadf = null;
 		VitroRequest vreq = new VitroRequest((HttpServletRequest) request);
-		
-        List<String> langs = new ArrayList<String>();
+
+		log.debug("Accept-Language: " + vreq.getHeader("Accept-Language"));
+		List<String> langs = LanguageFilteringUtils.localesToLanguages(vreq.getLocales());
         
-        log.debug("Accept-Language: " + vreq.getHeader("Accept-Language"));
-        Enumeration<Locale> locs = vreq.getLocales();
-        while (locs.hasMoreElements()) {
-            Locale locale = locs.nextElement();
-            langs.add(locale.toString().replace("_", "-"));
-        }
-        if (langs.isEmpty()) {
-            langs.add("en");
-        }
         WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
         config.setDefaultNamespace(defaultNamespace);
         config.setPreferredLanguages(langs);
@@ -110,30 +99,36 @@ public class WebappDaoFactorySDBPrep implements Filter {
 		RDFService unfilteredRDFService = factory.getShortTermRDFService();
 		RDFService rdfService = null;
 		
-		if (!"false".equals(
-		        ConfigurationProperties.getBean(vreq).getProperty(
-		                "RDFService.languageFilter", "true"))) {
-		    rdfService = new LanguageFilteringRDFService(unfilteredRDFService, langs);
+		if (Boolean.valueOf(ConfigurationProperties.getBean(vreq).getProperty(
+				"RDFService.languageFilter", "true"))) {
+			rdfService = new LanguageFilteringRDFService(unfilteredRDFService, langs);
+
+			OntModel rawDisplayModel = ModelAccess.on(vreq.getSession()).getDisplayModel();
+			OntModel filteredDisplayModel = LanguageFilteringUtils.wrapOntModelInALanguageFilter(rawDisplayModel, request);
+			ModelAccess.on(vreq).setDisplayModel(filteredDisplayModel);
 		} else {
-		    rdfService = unfilteredRDFService;
+			rdfService = unfilteredRDFService;
 		}
 		
 		Dataset dataset = new RDFServiceDataset(rdfService);
+
+		OntModelSelector oms = ModelAccess.on(_ctx).getUnionOntModelSelector();
 		wadf = new WebappDaoFactorySDB(rdfService, oms, config);
-	    WebappDaoFactory assertions = new WebappDaoFactorySDB(
+		ModelAccess.on(vreq).setWebappDaoFactory(wadf);
+	    
+		OntModelSelector baseOms = ModelAccess.on(_ctx).getBaseOntModelSelector();
+		WebappDaoFactory assertions = new WebappDaoFactorySDB(
 	            rdfService, baseOms, config, SDBDatasetMode.ASSERTIONS_ONLY);
+		
 	    vreq.setRDFService(rdfService);
 	    vreq.setUnfilteredRDFService(unfilteredRDFService);
-		vreq.setWebappDaoFactory(wadf);
-		vreq.setAssertionsWebappDaoFactory(assertions);
-		vreq.setFullWebappDaoFactory(wadf);
+		ModelAccess.on(vreq).setBaseWebappDaoFactory(assertions);
         vreq.setUnfilteredWebappDaoFactory(new WebappDaoFactorySDB(
-                rdfService, ModelContext.getUnionOntModelSelector(_ctx)));
+                rdfService, ModelAccess.on(_ctx).getUnionOntModelSelector()));
 		vreq.setDataset(dataset);
-		vreq.setOntModelSelector(baseOms);
 		
-		vreq.setJenaOntModel(ModelFactory.createOntologyModel(
-				OntModelSpec.OWL_MEM, dataset.getDefaultModel()));
+		ModelAccess.on(vreq).setJenaOntModel(
+				ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getDefaultModel()));
 					
 		request.setAttribute("WebappDaoFactorySDBPrep.setup", 1);
 		
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySparqlPrep.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySparqlPrep.java
index 770fb8c5a..400f32169 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySparqlPrep.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/WebappDaoFactorySparqlPrep.java
@@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory;
 import com.hp.hpl.jena.graph.Graph;
 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.rdf.model.Model;
@@ -39,10 +38,11 @@ import com.hp.hpl.jena.sdb.sql.SDBConnection;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.SingleContentOntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlDatasetGraph;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.SparqlGraphMultilingual;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
@@ -93,7 +93,6 @@ public class WebappDaoFactorySparqlPrep implements Filter {
 		
         javax.sql.DataSource ds = JenaDataSourceSetupBase.getApplicationDataSource(_ctx);
         StoreDesc storeDesc = (StoreDesc) _ctx.getAttribute("storeDesc");
-        OntModelSelector oms = (OntModelSelector) _ctx.getAttribute("unionOntModelSelector");
         String defaultNamespace = (String) _ctx.getAttribute("defaultNamespace");
         Connection sqlConn = null;
 		SDBConnection conn = null;
@@ -102,7 +101,7 @@ public class WebappDaoFactorySparqlPrep implements Filter {
 		WebappDaoFactory wadf = null;
 		
 		try {		
-		    if (ds == null || storeDesc == null || oms == null) {
+		    if (ds == null || storeDesc == null) {
 		        throw new RuntimeException("SDB store not property set up");
 		    }
 		    
@@ -147,25 +146,18 @@ public class WebappDaoFactorySparqlPrep implements Filter {
 				
 				Model m = ModelFactory.createModelForGraph(g);
 				OntModel om = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, m);
-				oms = new SingleContentOntModelSelector(om, oms.getDisplayModel(), oms.getUserAccountsModel());
-								
-				dataset = DatasetFactory.create(new SparqlDatasetGraph(endpointURI));
-				
-				//DataSource datasource = DatasetFactory.create();
-				//datasource.addNamedModel("fake:fake", m);
-				//dataset = datasource;			
-				
-				vreq.setAssertionsWebappDaoFactory(wadf);
-				
+				ModelAccess.on(vreq).setOntModel(ModelID.UNION_ABOX, om);
+				ModelAccess.on(vreq).setOntModel(ModelID.UNION_TBOX, om);
+				ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, om);
+
+				OntModelSelector oms = ModelAccess.on(vreq).getOntModelSelector();
 				wadf = new WebappDaoFactoryJena(oms, config);
-				//wadf = new WebappDaoFactorySDB(oms, dataset, config);
-				vreq.setWebappDaoFactory(wadf);
-				vreq.setFullWebappDaoFactory(wadf);
+				ModelAccess.on(vreq).setWebappDaoFactory(wadf);
+				ModelAccess.on(vreq).setBaseWebappDaoFactory(wadf);
 				vreq.setUnfilteredWebappDaoFactory(wadf);
-				vreq.setWebappDaoFactory(wadf);
+
+				dataset = DatasetFactory.create(new SparqlDatasetGraph(endpointURI));
 				vreq.setDataset(dataset);
-				vreq.setJenaOntModel(om);
-				vreq.setOntModelSelector(oms);
 			}
 		} catch (Throwable t) {
 			log.error("Unable to filter request to set up SDB connection", t);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
index 1df269857..936462153 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringRDFService.java
@@ -8,8 +8,10 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -368,17 +370,20 @@ public class LanguageFilteringRDFService implements RDFService {
 
 			int index = langs.indexOf(lang);
 			if (index >= 0) {
+				log.debug("languageIndex for '" + lang + "' is " + index);
 				return index;
 			}
 
 			if (lang.length() > 2) {
 				index = langs.indexOf(lang.substring(0, 2));
 				if (index >= 0) {
+					log.debug("languageIndex for '" + lang + "' is " + index + inexactMatchPenalty);
 					return index + inexactMatchPenalty;
 				}
 			}
 
 			if (lang.isEmpty()) {
+				log.debug("languageIndex for '" + lang + "' is " + noLanguage);
 				return noLanguage;
 			}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java
new file mode 100644
index 000000000..a1e2e879d
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/filter/LanguageFilteringUtils.java
@@ -0,0 +1,63 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.rdfservice.filter;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+
+import javax.servlet.ServletRequest;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceGraph;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel;
+
+/**
+ * Some methods that will come in handy when dealing with Language Filtering
+ */
+public class LanguageFilteringUtils {
+
+	/**
+	 * Take an Enumeration of Locale objects, such as we might get from a
+	 * request, and convert to a List of langauage strings, such as are needed
+	 * by the LanguageFilteringRDFService.
+	 * 
+	 * While converting, change all underscores (as in Locale names) to hyphens
+	 * (as in RDF language specifiers).
+	 */
+	public static List<String> localesToLanguages(Enumeration<?> locales) {
+		List<String> langs = new ArrayList<>();
+		while (locales.hasMoreElements()) {
+			Locale locale = (Locale) locales.nextElement();
+			langs.add(locale.toString().replace("_", "-"));
+		}
+		if (langs.isEmpty()) {
+			langs.add("en");
+		}
+		return langs;
+
+	}
+
+	/**
+	 * Add a Language Filtering layer to an OntModel by treating it as an RDFService.
+	 */
+	public static OntModel wrapOntModelInALanguageFilter(OntModel rawModel,
+			ServletRequest req) {
+		/** This is some nasty layering. Could we do this more easily? */
+		List<String> languages = localesToLanguages(req.getLocales());
+		return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM,
+				RDFServiceGraph.createRDFServiceModel(
+						new RDFServiceGraph(
+								new LanguageFilteringRDFService(
+										new RDFServiceModel(rawModel), languages))));
+	}
+
+	private LanguageFilteringUtils() {
+		// Nothing to instantiate
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
index 568f3713e..d742a3301 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SolrSetup.java
@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.search.solr;
 
-import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -11,19 +10,16 @@ import java.util.List;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
 
 import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.vocabulary.OWL;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.WebappDaoFactoryFiltering;
@@ -31,8 +27,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilterUtils;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFilters;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-import edu.cornell.mannlib.vitro.webapp.search.beans.FileBasedProhibitedFromSearch;
-import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
 import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate;
 import edu.cornell.mannlib.vitro.webapp.search.indexing.AdditionalURIsForContextNodes;
 import edu.cornell.mannlib.vitro.webapp.search.indexing.AdditionalURIsForDataProperties;
@@ -119,8 +113,8 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
             context.setAttribute(SOLR_SERVER, server);
             
             /* set up the individual to solr doc translation */            
-            OntModel jenaOntModel = ModelContext.getJenaOntModel(context);            
-            Model displayModel = ModelContext.getDisplayModel(context);
+            OntModel jenaOntModel = ModelAccess.on(context).getJenaOntModel();            
+            OntModel displayModel = ModelAccess.on(context).getDisplayModel();
             
             /* try to get context attribute DocumentModifiers 
              * and use that as the start of the list of DocumentModifier 
@@ -161,7 +155,7 @@ public class SolrSetup implements javax.servlet.ServletContextListener{
             // This is where the builder gets the list of places to try to
             // get objects to index. It is filtered so that non-public text
             // does not get into the search index.
-            WebappDaoFactory wadf = (WebappDaoFactory) context.getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(context).getWebappDaoFactory();
             VitroFilters vf = VitroFilterUtils.getPublicFilter(context);
             wadf = new WebappDaoFactoryFiltering(wadf, vf);            
             
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ApplicationModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ApplicationModelSetup.java
index 15fc6a49f..366cbc5d6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ApplicationModelSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ApplicationModelSetup.java
@@ -9,7 +9,6 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.joda.time.DateTime;
@@ -23,7 +22,8 @@ import com.hp.hpl.jena.query.QueryFactory;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -63,8 +63,8 @@ implements ServletContextListener {
             }
             OntModel displayModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
             displayModel.add(displayDbModel);           
-            displayModel.getBaseModel().register(new ModelSynchronizer(displayDbModel));            
-            ModelContext.setDisplayModel(displayModel, ctx);
+            displayModel.getBaseModel().register(new ModelSynchronizer(displayDbModel));        
+            ModelAccess.on(ctx).setDisplayModel(displayModel);
             
             //at each startup load all RDF files from directory to sub-models of display model  
             initializeDisplayLoadedAtStartup(ctx, displayModel);                
@@ -84,7 +84,7 @@ implements ServletContextListener {
                     MEM_ONT_MODEL_SPEC);
             appTBOXModel.add(displayTboxModel);
             appTBOXModel.getBaseModel().register(new ModelSynchronizer(displayTboxModel));
-            ctx.setAttribute("displayOntModelTBOX", appTBOXModel);
+            ModelAccess.on(ctx).setOntModel(ModelID.DISPLAY_TBOX, appTBOXModel);
             log.debug("Loaded file " + APPPATH_LOAD + "displayTBOX.n3 into display tbox model");
         } catch (Throwable t) {
             log.error("Unable to load user application configuration model TBOX", t);
@@ -102,7 +102,7 @@ implements ServletContextListener {
                     MEM_ONT_MODEL_SPEC);
             appDisplayDisplayModel.add(displayDisplayModel);
             appDisplayDisplayModel.getBaseModel().register(new ModelSynchronizer(displayDisplayModel));
-            ctx.setAttribute("displayOntModelDisplayModel", appDisplayDisplayModel);
+            ModelAccess.on(ctx).setOntModel(ModelID.DISPLAY_DISPLAY, appDisplayDisplayModel);
             log.debug("Loaded file " + APPPATH_LOAD + "displayDisplay.n3 into display display model");
         } catch (Throwable t) {
             log.error("Unable to load user application configuration model Display Model", t);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AssembleModelsSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AssembleModelsSetup.java
index e9dbc9f20..d95c4fc68 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AssembleModelsSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/AssembleModelsSetup.java
@@ -22,6 +22,7 @@ import com.hp.hpl.jena.rdf.model.ResourceFactory;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 import com.hp.hpl.jena.vocabulary.RDF;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
 
 /**
@@ -42,14 +43,7 @@ public class AssembleModelsSetup implements ServletContextListener {
 	private String SYNTAX = "N3";
 	
 	public void contextInitialized(ServletContextEvent sce) {
-	    
-		OntModel jenaOntModel = null;
-		try {
-			jenaOntModel = (OntModel) sce.getServletContext().getAttribute("baseOntModel");
-		} catch (Exception e) {
-			log.error("No baseOntModel found to which to attach assembled models");
-			return;
-		}
+		OntModel jenaOntModel = ModelAccess.on(sce.getServletContext()).getBaseOntModel();
 		// read assemblers out of assemblers directory
 		Set pathSet = sce.getServletContext().getResourcePaths(ASSEMBLERS_DIR_PATH);
 		for (String path : (Set<String>)pathSet) {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
new file mode 100644
index 000000000..fcf9d4182
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
@@ -0,0 +1,262 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet.setup;
+
+import static edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB.SDBDatasetMode.ASSERTIONS_ONLY;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.graph.BulkUpdateHandler;
+import com.hp.hpl.jena.graph.Graph;
+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.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.ResIterator;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.ResourceUtils;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.FactoryID;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.SpecialBulkUpdateHandlerGraph;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+import edu.cornell.mannlib.vitro.webapp.utils.jena.InitialJenaModelUtils;
+
+/**
+ * Sets up the content models, OntModelSelectors and webapp DAO factories.
+ */
+public class ContentModelSetup extends JenaDataSourceSetupBase 
+        implements javax.servlet.ServletContextListener {
+    
+    private static final Log log = LogFactory.getLog(ContentModelSetup.class);
+    
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        ServletContext ctx = sce.getServletContext();
+        StartupStatus ss = StartupStatus.getBean(ctx);
+        
+        long begin = System.currentTimeMillis();
+        setUpJenaDataSource(ctx);
+        ss.info(this, secondsSince(begin) + " seconds to set up models and DAO factories");  
+    } 
+
+    private void setUpJenaDataSource(ServletContext ctx) {
+    	RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(ctx);
+    	RDFService rdfService = rdfServiceFactory.getRDFService();
+    	Dataset dataset = new RDFServiceDataset(rdfService);
+    	setStartupDataset(dataset, ctx);
+    	
+    	OntModel applicationMetadataModel = createdMemoryMappedModel(dataset, JENA_APPLICATION_METADATA_MODEL, "application metadata model");
+		if (applicationMetadataModel.size()== 0) {
+			JenaDataSourceSetupBase.thisIsFirstStartup();
+		}
+
+    	ModelAccess models = ModelAccess.on(ctx);
+        OntModel baseABoxModel = createNamedModelFromDataset(dataset, JENA_DB_MODEL);
+        OntModel inferenceABoxModel = createNamedModelFromDataset(dataset, JENA_INF_MODEL);
+        OntModel baseTBoxModel = createdMemoryMappedModel(dataset, JENA_TBOX_ASSERTIONS_MODEL, "tbox assertions");
+        OntModel inferenceTBoxModel = createdMemoryMappedModel(dataset, JENA_TBOX_INF_MODEL, "tbox inferences");
+        OntModel unionABoxModel = createCombinedBulkUpdatingModel(baseABoxModel, inferenceABoxModel);
+        OntModel unionTBoxModel = createCombinedBulkUpdatingModel(baseTBoxModel, inferenceTBoxModel);
+
+        if (isFirstStartup()) {
+        	loadInitialApplicationMetadataModel(applicationMetadataModel, ctx);
+        	loadDataFromFilesystem(baseABoxModel, baseTBoxModel, applicationMetadataModel, ctx);
+        }
+        
+        log.info("Setting up union models");
+        OntModel baseFullModel = createCombinedBulkUpdatingModel(baseABoxModel, baseTBoxModel);
+        OntModel inferenceFullModel = createCombinedModel(inferenceABoxModel, inferenceTBoxModel);
+        OntModel unionFullModel = ModelFactory.createOntologyModel(DB_ONT_MODEL_SPEC, dataset.getDefaultModel());
+
+        models.setOntModel(ModelID.APPLICATION_METADATA, applicationMetadataModel);
+
+        models.setOntModel(ModelID.BASE_ABOX, baseABoxModel);
+        models.setOntModel(ModelID.BASE_TBOX, baseTBoxModel);
+        models.setOntModel(ModelID.BASE_FULL, baseFullModel);
+        models.setOntModel(ModelID.INFERRED_ABOX, inferenceABoxModel);
+        models.setOntModel(ModelID.INFERRED_TBOX, inferenceTBoxModel);
+        models.setOntModel(ModelID.INFERRED_FULL, inferenceFullModel);
+        models.setOntModel(ModelID.UNION_ABOX, unionABoxModel);
+        models.setOntModel(ModelID.UNION_TBOX, unionTBoxModel);
+        models.setOntModel(ModelID.UNION_FULL, unionFullModel);
+        
+        checkForNamespaceMismatch( applicationMetadataModel, ctx );
+        
+		log.info("Setting up DAO factories");
+		
+        WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
+        config.setDefaultNamespace(getDefaultNamespace(ctx));
+        
+        OntModelSelector baseOms = models.getBaseOntModelSelector();
+        WebappDaoFactory baseWadf = new WebappDaoFactorySDB(rdfService, baseOms, config, ASSERTIONS_ONLY);
+        ModelAccess.on(ctx).setBaseWebappDaoFactory(baseWadf);
+        
+        OntModelSelector unionOms = models.getUnionOntModelSelector();
+        WebappDaoFactory wadf = new WebappDaoFactorySDB(rdfService, unionOms, config);
+        ModelAccess.on(ctx).setWebappDaoFactory(FactoryID.UNION, wadf);
+
+        log.info("Model makers set up");
+        
+        ctx.setAttribute("defaultNamespace", getDefaultNamespace(ctx));
+    }
+
+	private OntModel createNamedModelFromDataset(Dataset dataset, String name) {
+    	return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getNamedModel(name));
+    }
+    
+	private OntModel createdMemoryMappedModel(Dataset dataset, String name, String label) {
+		try {
+			Model dbModel = dataset.getNamedModel(name);
+			OntModel memoryModel = ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
+			
+			if (dbModel != null) {
+			    long begin = System.currentTimeMillis();
+				log.info("Copying cached " + label + " into memory");
+			    memoryModel.add(dbModel);
+			    log.info(secondsSince(begin) + " seconds to load " + label);
+			    memoryModel.getBaseModel().register(new ModelSynchronizer(dbModel));
+			}
+			return memoryModel;
+        } catch (Throwable e) {
+            throw new RuntimeException("Unable to load " + label + " from DB", e);
+        }
+	}
+
+	private OntModel createCombinedModel(OntModel oneModel, OntModel otherModel) {
+        return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, 
+        		ModelFactory.createUnion(oneModel, otherModel));
+	}
+
+	private OntModel createCombinedBulkUpdatingModel(OntModel baseModel,
+			OntModel otherModel) {
+		BulkUpdateHandler bulkUpdateHandler = baseModel.getGraph().getBulkUpdateHandler();
+		Graph unionGraph = ModelFactory.createUnion(baseModel, otherModel).getGraph();
+		Model unionModel = ModelFactory.createModelForGraph(
+				new SpecialBulkUpdateHandlerGraph(unionGraph, bulkUpdateHandler));
+		return ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC, unionModel);
+	}
+
+	private void loadInitialApplicationMetadataModel(OntModel applicationMetadataModel,
+			ServletContext ctx) {
+		try {
+			applicationMetadataModel.add(
+					InitialJenaModelUtils.loadInitialModel(ctx, getDefaultNamespace(ctx)));
+		} catch (Throwable e) {
+			throw new RuntimeException("Unable to load application metadata model cache from DB", e);
+		}
+	}
+
+	private void loadDataFromFilesystem(OntModel baseABoxModel, OntModel baseTBoxModel, OntModel applicationMetadataModel, 
+			ServletContext ctx) {
+		Long startTime = System.currentTimeMillis();
+		log.info("Initializing models from RDF files");    
+		
+		readOntologyFilesInPathSet(USER_ABOX_PATH, ctx, baseABoxModel);
+		readOntologyFilesInPathSet(USER_TBOX_PATH, ctx, baseTBoxModel);
+		readOntologyFilesInPathSet(USER_APPMETA_PATH, ctx, applicationMetadataModel);
+		
+		log.debug(((System.currentTimeMillis() - startTime) / 1000)
+				+ " seconds to read RDF files ");
+	}
+	
+	private long secondsSince(long startTime) {
+		return (System.currentTimeMillis() - startTime) / 1000;
+	}
+
+    /* ===================================================================== */
+
+    /**
+     * If we find a "portal1" portal (and we should), its URI should use the
+     * default namespace.
+     */
+    private void checkForNamespaceMismatch(OntModel model, ServletContext ctx) {
+        String expectedNamespace = getDefaultNamespace(ctx);
+
+        List<Resource> portals = getPortal1s(model);
+
+        if(!portals.isEmpty() && noPortalForNamespace(
+                portals, expectedNamespace)) {
+            // There really should be only one portal 1, but if there happen to 
+            // be multiple, just arbitrarily pick the first in the list.
+            Resource portal = portals.get(0); 
+            String oldNamespace = portal.getNameSpace();
+            renamePortal(portal, expectedNamespace, model);
+            StartupStatus ss = StartupStatus.getBean(ctx);
+            ss.warning(this, "\nThe default namespace has been changed \n" +  
+                             "from " + oldNamespace + 
+                             "\nto " + expectedNamespace + ".\n" +
+                             "The application will function normally, but " +
+                             "any individuals in the \n" + oldNamespace + " " + 
+                             "namespace will need to have their URIs \n" +
+                             "changed in order to be served as linked data. " +
+                             "You can use the Ingest Tools \nto change the " +
+                             "URIs for a batch of resources.");
+        }
+    }
+    
+    private List<Resource> getPortal1s(Model model) {
+        List<Resource> portals = new ArrayList<Resource>();
+        try {
+            model.enterCriticalSection(Lock.READ);
+            ResIterator portalIt = model.listResourcesWithProperty(
+                    RDF.type, PORTAL);
+            while (portalIt.hasNext()) {
+                Resource portal = portalIt.nextResource();
+                if ("portal1".equals(portal.getLocalName())) {
+                    portals.add(portal);
+                }
+            }
+        } finally {
+            model.leaveCriticalSection();
+        }
+        return portals;
+    }
+    
+    private boolean noPortalForNamespace(List<Resource> portals, String expectedNamespace) {
+        for (Resource portal : portals) {
+            if(expectedNamespace.equals(portal.getNameSpace())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void renamePortal(Resource portal, String namespace, Model model) {
+        model.enterCriticalSection(Lock.WRITE);
+        try {
+            ResourceUtils.renameResource(portal, namespace + portal.getLocalName());
+        } finally {
+            model.leaveCriticalSection();
+        }
+    }
+    
+    /* ===================================================================== */
+    
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        // Nothing to do.
+    }    
+ 
+ }
+
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
index cbd3e77d9..f734f2054 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/FileGraphSetup.java
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.query.Dataset;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
@@ -48,16 +48,16 @@ public class FileGraphSetup implements ServletContextListener {
         boolean tboxChanged = false; // indicates whether any TBox file graph model has changed
         OntModelSelector baseOms = null;
 
+        ServletContext ctx = sce.getServletContext();
+        
         try {
-
-            ServletContext ctx = sce.getServletContext();
             OntDocumentManager.getInstance().setProcessImports(true);
-            baseOms = ModelContext.getBaseOntModelSelector(sce.getServletContext());
-            Dataset dataset = JenaDataSourceSetupBase.getStartupDataset(sce.getServletContext());
+            baseOms = ModelAccess.on(ctx).getBaseOntModelSelector();
+            Dataset dataset = JenaDataSourceSetupBase.getStartupDataset(ctx);
             RDFServiceModelMaker maker = new RDFServiceModelMaker(RDFServiceUtils.getRDFServiceFactory(ctx));
 
             // ABox files
-            Set<String> pathSet = sce.getServletContext().getResourcePaths(PATH_ROOT + ABOX);
+            Set<String> pathSet = ctx.getResourcePaths(PATH_ROOT + ABOX);
 
             cleanupDB(dataset, pathToURI(pathSet, ABOX), ABOX);
 
@@ -67,7 +67,7 @@ public class FileGraphSetup implements ServletContextListener {
             }
 
             // TBox files
-            pathSet = sce.getServletContext().getResourcePaths(PATH_ROOT + TBOX);
+            pathSet = ctx.getResourcePaths(PATH_ROOT + TBOX);
 
             cleanupDB(dataset, pathToURI(pathSet, TBOX),TBOX);
 
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 fbe8e61f4..f56d75a3d 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
@@ -471,7 +471,7 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
         } else if (TripleStoreType.SDB.equals(type)) {
             StoreDesc storeDesc = new StoreDesc(
                     LayoutType.LayoutTripleNodesHash, DatabaseType.fetch(dbtypeStr));
-            DataSource bds = WebappDaoSetup.makeC3poDataSource(
+            DataSource bds = ContentModelSetup.makeC3poDataSource(
                     getDbDriverClassName(ctx), jdbcUrl, username, password, ctx);
 //            DataSource bds = WebappDaoSetup.makeBasicDataSource(
 //                    getDbDriverClassName(ctx), jdbcUrl, username, password, ctx);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ModelMakerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ModelMakerSetup.java
new file mode 100644
index 000000000..8ce03734b
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ModelMakerSetup.java
@@ -0,0 +1,54 @@
+/* $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.ServletContext;
+import javax.servlet.ServletContextEvent;
+
+import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
+import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Sets up the content models, OntModelSelectors and webapp DAO factories.
+ */
+public class ModelMakerSetup extends JenaDataSourceSetupBase 
+        implements javax.servlet.ServletContextListener {
+    
+    @Override
+    public void contextInitialized(ServletContextEvent sce) {
+        ServletContext ctx = sce.getServletContext();
+        StartupStatus ss = StartupStatus.getBean(ctx);
+        
+        long begin = System.currentTimeMillis();
+        
+        RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(ctx);
+		makeModelMakerFromConnectionProperties(TripleStoreType.RDB, ctx);
+		VitroJenaModelMaker vjmm = getVitroJenaModelMaker();
+		setVitroJenaModelMaker(vjmm, ctx);
+		makeModelMakerFromConnectionProperties(TripleStoreType.SDB, ctx);
+		RDFServiceModelMaker vsmm = new RDFServiceModelMaker(rdfServiceFactory);
+		setVitroJenaSDBModelMaker(vsmm, ctx);
+		        
+		//bdc34: I have no reason for vsmm vs vjmm.  
+		//I don't know what are the implications of this choice.        
+		setVitroModelSource( new VitroModelSource(vsmm,ctx), ctx);
+        
+        ss.info(this, secondsSince(begin) + " seconds to set up models and DAO factories");  
+    } 
+
+    private long secondsSince(long startTime) {
+		return (System.currentTimeMillis() - startTime) / 1000;
+	}
+
+    /* ===================================================================== */
+    
+    @Override
+    public void contextDestroyed(ServletContextEvent sce) {
+        // Nothing to do.
+    }    
+ }
+
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
index ebba991b6..2687af6fa 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/PropertyMaskingSetup.java
@@ -13,15 +13,15 @@ import net.sf.jga.fn.UnaryFunctor;
 import com.hp.hpl.jena.ontology.OntModel;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.EntityPropertyListFilter;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao;
 
 public class PropertyMaskingSetup implements ServletContextListener {
 
 	private final static String ENTITY_PROPERTY_LIST_FILTER_ATTR_NAME = "entityPropertyListFilter";
 
 	public void contextInitialized(ServletContextEvent sce) {
-		OntModel jenaOntModel = (OntModel) sce.getServletContext().getAttribute(JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME);		
+		OntModel jenaOntModel = ModelAccess.on(sce.getServletContext()).getJenaOntModel();
         sce.getServletContext().setAttribute(ENTITY_PROPERTY_LIST_FILTER_ATTR_NAME, new EntityPropertyListFilter(jenaOntModel));
 	}
 	
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
index b76bebb85..c495496d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RunSparqlConstructs.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.Random;
 import java.util.Set;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
@@ -28,6 +29,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.rdf.model.Resource;
 import com.hp.hpl.jena.util.ResourceUtils;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 
 public class RunSparqlConstructs implements ServletContextListener {
@@ -42,18 +44,20 @@ public class RunSparqlConstructs implements ServletContextListener {
 	
 	public void contextInitialized(ServletContextEvent sce) {
 		try {
-			WebappDaoFactory wadf = (WebappDaoFactory) sce.getServletContext().getAttribute("webappDaoFactory");
+			ServletContext ctx = sce.getServletContext();
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
+
 			String namespace = (wadf != null && wadf.getDefaultNamespace() != null) 
 				? wadf.getDefaultNamespace() : DEFAULT_DEFAULT_NAMESPACE;
 			
-			OntModel baseOntModel = (OntModel) sce.getServletContext().getAttribute("baseOntModel");
+		    OntModel baseOntModel = ModelAccess.on(ctx).getBaseOntModel();
 			Model anonModel = ModelFactory.createDefaultModel();
 			Model namedModel = ModelFactory.createDefaultModel();
 			
-			Set<String> resourcePaths = sce.getServletContext().getResourcePaths(SPARQL_DIR);
+			Set<String> resourcePaths = ctx.getResourcePaths(SPARQL_DIR);
 			for (String path : resourcePaths) {
 				log.debug("Attempting to execute SPARQL at " + path);
-				File file = new File(sce.getServletContext().getRealPath(path));			
+				File file = new File(ctx.getRealPath(path));			
 				try {
 					BufferedReader reader = new BufferedReader(new FileReader(file));
 					StringBuffer fileContents = new StringBuffer();
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
index 02295bb63..b84913c54 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/SimpleReasonerSetup.java
@@ -22,7 +22,8 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.vocabulary.OWL;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+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.RDFServiceDataset;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
@@ -33,7 +34,6 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
 import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin;
 import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasoner;
 import edu.cornell.mannlib.vitro.webapp.reasoner.SimpleReasonerTBoxListener;
-import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase.TripleStoreType;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 public class SimpleReasonerSetup implements ServletContextListener {
@@ -48,15 +48,15 @@ public class SimpleReasonerSetup implements ServletContextListener {
 
     @Override
     public void contextInitialized(ServletContextEvent sce) {
+    	ServletContext ctx = sce.getServletContext();
         
         try {    
             // set up Pellet reasoning for the TBox    
-            
-            OntModelSelector assertionsOms = ModelContext.getBaseOntModelSelector(sce.getServletContext());
-            OntModelSelector inferencesOms = ModelContext.getInferenceOntModelSelector(sce.getServletContext());
-            OntModelSelector unionOms = ModelContext.getUnionOntModelSelector(sce.getServletContext());
+            OntModelSelector assertionsOms = ModelAccess.on(ctx).getBaseOntModelSelector();
+            OntModelSelector inferencesOms = ModelAccess.on(ctx).getInferenceOntModelSelector();
+            OntModelSelector unionOms = ModelAccess.on(ctx).getUnionOntModelSelector();
 
-            WebappDaoFactoryJena wadf = (WebappDaoFactoryJena) sce.getServletContext().getAttribute("webappDaoFactory");
+			WebappDaoFactoryJena wadf = (WebappDaoFactoryJena) ModelAccess.on(ctx).getWebappDaoFactory();
             
             if (!assertionsOms.getTBoxModel().getProfile().NAMESPACE().equals(OWL.NAMESPACE.getNameSpace())) {        
                 log.error("Not connecting Pellet reasoner - the TBox assertions model is not an OWL model");
@@ -83,7 +83,6 @@ public class SimpleReasonerSetup implements ServletContextListener {
      
            // set up simple reasoning for the ABox
                     
-            ServletContext ctx = sce.getServletContext();
             DataSource bds = JenaDataSourceSetupBase
                                     .getApplicationDataSource(ctx);
             String dbType = ConfigurationProperties.getBean(ctx).getProperty( // database type
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java
index 92547ce2a..6b917c43f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ThemeInfoSetup.java
@@ -23,7 +23,9 @@ import com.hp.hpl.jena.util.iterator.ClosableIterator;
 
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean.ThemeInfo;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -91,8 +93,7 @@ public class ThemeInfoSetup implements ServletContextListener {
 	}
 
 	private String getCurrentThemeName(ServletContext ctx) {
-		OntModel ontModel = ModelContext.getBaseOntModelSelector(ctx)
-				.getApplicationMetadataModel();
+		OntModel ontModel = ModelAccess.on(ctx).getApplicationMetadataModel();
 
 		ontModel.enterCriticalSection(Lock.READ);
 		try {
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
index dcfc12e3e..28fa02f5e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java
@@ -32,8 +32,8 @@ import com.hp.hpl.jena.vocabulary.RDF;
 import com.hp.hpl.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
 import edu.cornell.mannlib.vitro.webapp.ontology.update.KnowledgeBaseUpdater;
 import edu.cornell.mannlib.vitro.webapp.ontology.update.UpdateSettings;
 
@@ -99,14 +99,14 @@ public class UpdateKnowledgeBase implements ServletContextListener {
 			settings.setErrorLogFile(ctx.getRealPath(errorLogFileName));
 			settings.setAddedDataFile(ctx.getRealPath(ADDED_DATA_FILE));
 			settings.setRemovedDataFile(ctx.getRealPath(REMOVED_DATA_FILE));
-			WebappDaoFactory wadf = (WebappDaoFactory) ctx.getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			settings.setDefaultNamespace(wadf.getDefaultNamespace());
-			settings.setAssertionOntModelSelector(ModelContext.getBaseOntModelSelector(ctx));
-			settings.setInferenceOntModelSelector(ModelContext.getInferenceOntModelSelector(ctx));
-			settings.setUnionOntModelSelector(ModelContext.getUnionOntModelSelector(ctx));
+			settings.setAssertionOntModelSelector(ModelAccess.on(ctx).getBaseOntModelSelector());
+			settings.setInferenceOntModelSelector(ModelAccess.on(ctx).getInferenceOntModelSelector());
+			settings.setUnionOntModelSelector(ModelAccess.on(ctx).getUnionOntModelSelector());
 			boolean tryMigrateDisplay = true;
 			try {
-				settings.setDisplayModel(ModelContext.getDisplayModel(ctx));
+				settings.setDisplayModel(ModelAccess.on(ctx).getDisplayModel());
 				OntModel oldTBoxModel = loadModelFromDirectory(ctx.getRealPath(OLD_TBOX_MODEL_DIR));
 				settings.setOldTBoxModel(oldTBoxModel);
 				OntModel newTBoxModel = loadModelFromDirectory(ctx.getRealPath(NEW_TBOX_MODEL_DIR));
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdatePermissionSetUris.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdatePermissionSetUris.java
index f0fffdc7b..ec03f70ff 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdatePermissionSetUris.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdatePermissionSetUris.java
@@ -22,6 +22,7 @@ import javax.servlet.ServletContextListener;
 
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@@ -99,8 +100,7 @@ public class UpdatePermissionSetUris implements ServletContextListener {
 			this.ctx = ctx;
 			this.stats = stats;
 
-			WebappDaoFactory wadf = (WebappDaoFactory) ctx
-					.getAttribute("webappDaoFactory");
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
 			userAccountsDao = wadf.getUserAccountsDao();
 		}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
index 3d1a54d6f..47b51a5a3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
@@ -6,7 +6,6 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -14,6 +13,7 @@ import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -65,7 +65,7 @@ public class UserModelSetup extends JenaDataSourceSetupBase
         	userAccountsModel.add(userAccountsDbModel);
             userAccountsModel.getBaseModel().register(
                     new ModelSynchronizer(userAccountsDbModel));
-            ctx.setAttribute("userAccountsOntModel", userAccountsModel);
+            ModelAccess.on(ctx).setUserAccountsModel(userAccountsModel);
                         
         } catch (Throwable t) {
             log.error("Unable to load user accounts model from DB", t);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java
deleted file mode 100644
index b55cba9fd..000000000
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/WebappDaoSetup.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.servlet.setup;
-
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.DISPLAY_ONT_MODEL;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-
-import org.apache.commons.logging.Log;
-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.Dataset;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-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.shared.Lock;
-import com.hp.hpl.jena.util.ResourceUtils;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryConfig;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelectorImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceDataset;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.RDFServiceModelMaker;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.SpecialBulkUpdateHandlerGraph;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactorySDB;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
-import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-import edu.cornell.mannlib.vitro.webapp.utils.jena.InitialJenaModelUtils;
-
-/**
- * Primarily sets up webapp DAO factories.
- */
-public class WebappDaoSetup extends JenaDataSourceSetupBase 
-        implements javax.servlet.ServletContextListener {
-    
-    private static final Log log = LogFactory.getLog(WebappDaoSetup.class);
-    
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        ServletContext ctx = sce.getServletContext();
-        StartupStatus ss = StartupStatus.getBean(ctx);
-        
-        try {
-            long startTime = System.currentTimeMillis();
-            setUpJenaDataSource(ctx, ss);
-            log.info((System.currentTimeMillis() - startTime) / 1000 + 
-                    " seconds to set up models and DAO factories");  
-        } catch (Throwable t) {
-            log.error("Throwable in " + this.getClass().getName(), t);
-            ss.fatal(this, "Throwable in " + this.getClass().getName(), t);
-        }
-        
-    } 
-
-    private void setUpJenaDataSource(ServletContext ctx, StartupStatus ss) {
-        OntModelSelectorImpl baseOms = new OntModelSelectorImpl();     
-        OntModelSelectorImpl inferenceOms = new OntModelSelectorImpl();       
-        OntModelSelectorImpl unionOms = new OntModelSelectorImpl();
-        
-        OntModel userAccountsModel = ontModelFromContextAttribute(
-                ctx, "userAccountsOntModel");     
-        baseOms.setUserAccountsModel(userAccountsModel);
-        inferenceOms.setUserAccountsModel(userAccountsModel);
-        unionOms.setUserAccountsModel(userAccountsModel);       
-        
-        OntModel displayModel = ontModelFromContextAttribute(
-                ctx,DISPLAY_ONT_MODEL);
-        baseOms.setDisplayModel(displayModel);
-        inferenceOms.setDisplayModel(displayModel);
-        unionOms.setDisplayModel(displayModel);
-                
-        RDFServiceFactory rdfServiceFactory = RDFServiceUtils.getRDFServiceFactory(ctx);
-        RDFService rdfService = rdfServiceFactory.getRDFService();
-        Dataset dataset = new RDFServiceDataset(rdfService);
-        setStartupDataset(dataset, ctx);
-        
-        // ABox assertions
-        baseOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getNamedModel(JenaDataSourceSetupBase.JENA_DB_MODEL)));
-        
-        // ABox inferences
-        inferenceOms.setABoxModel(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM, dataset.getNamedModel(JenaDataSourceSetupBase.JENA_INF_MODEL)));
-        
-        // TBox assertions
-        try {
-            Model tboxAssertionsDB = dataset.getNamedModel(
-                    JENA_TBOX_ASSERTIONS_MODEL);
-            OntModel tboxAssertions = ModelFactory.createOntologyModel(
-                    MEM_ONT_MODEL_SPEC);
-            
-            if (tboxAssertionsDB != null) {
-                long startTime = System.currentTimeMillis();
-                log.info("Copying cached tbox assertions into memory");
-                tboxAssertions.add(tboxAssertionsDB);
-                log.info((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);
-            throw new RuntimeException(e);
-        }
-        
-        // TBox inferences
-        try {
-            Model tboxInferencesDB = dataset.getNamedModel(JENA_TBOX_INF_MODEL);
-            OntModel tboxInferences = ModelFactory.createOntologyModel(
-                    MEM_ONT_MODEL_SPEC);
-            
-            if (tboxInferencesDB != null) {
-                long startTime = System.currentTimeMillis();
-                log.info(
-                        "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);
-            throw new RuntimeException(e);
-        }
-                              
-        // union ABox
-        Model m = ModelFactory.createUnion(
-                baseOms.getABoxModel(), inferenceOms.getABoxModel());
-        m = ModelFactory.createModelForGraph(
-                new SpecialBulkUpdateHandlerGraph(
-                        m.getGraph(), 
-                        baseOms.getABoxModel().getGraph().getBulkUpdateHandler()));
-        OntModel unionABoxModel = ModelFactory.createOntologyModel(
-                MEM_ONT_MODEL_SPEC, m);
-        unionOms.setABoxModel(unionABoxModel);
-        
-        // union TBox
-        m = ModelFactory.createUnion(baseOms.getTBoxModel(), inferenceOms.getTBoxModel());
-        m = ModelFactory.createModelForGraph(
-                new SpecialBulkUpdateHandlerGraph(
-                        m.getGraph(), 
-                        baseOms.getTBoxModel().getGraph().getBulkUpdateHandler()));
-        OntModel unionTBoxModel = ModelFactory.createOntologyModel(
-                MEM_ONT_MODEL_SPEC, m);       
-        unionOms.setTBoxModel(unionTBoxModel);
-                  
-        
-        // Application metadata model is cached in memory.
-        try {
-            
-            Model applicationMetadataModelDB = dataset.getNamedModel(
-                    JENA_APPLICATION_METADATA_MODEL);
-            OntModel applicationMetadataModel = 
-                    ModelFactory.createOntologyModel(MEM_ONT_MODEL_SPEC);
-            
-            long startTime = System.currentTimeMillis();
-            System.out.println(
-                    "Copying cached application metadata model into memory");
-            applicationMetadataModel.add(applicationMetadataModelDB);
-            System.out.println((System.currentTimeMillis() - startTime) 
-                    / 1000 + " seconds to load application metadata model " +
-                    "assertions of size " + applicationMetadataModel.size());
-            applicationMetadataModel.getBaseModel().register(
-                    new ModelSynchronizer(applicationMetadataModelDB));
-            
-            if (applicationMetadataModel.size()== 0 /* isFirstStartup() */) {
-                JenaDataSourceSetupBase.thisIsFirstStartup();
-                applicationMetadataModel.add(
-                        InitialJenaModelUtils.loadInitialModel(
-                                ctx, getDefaultNamespace(ctx)));
-            }
-            
-            baseOms.setApplicationMetadataModel(applicationMetadataModel);
-            inferenceOms.setApplicationMetadataModel(
-                    baseOms.getApplicationMetadataModel());
-            unionOms.setApplicationMetadataModel(
-                    baseOms.getApplicationMetadataModel());
-            
-        } catch (Throwable e) {
-            log.error("Unable to load application metadata model cache from DB"
-                    , e);
-            throw new RuntimeException(e);
-        }
-        
-        checkForNamespaceMismatch( baseOms.getApplicationMetadataModel(), ctx );
-        
-        if (isFirstStartup()) {
-            loadDataFromFilesystem(baseOms, ctx);
-        }
-        
-        log.info("Setting up union models and DAO factories");
-        
-        // create TBox + ABox union models and set up webapp DAO factories
-        Model baseDynamicUnion = ModelFactory.createUnion(baseOms.getABoxModel(), 
-                baseOms.getTBoxModel());
-        baseDynamicUnion = ModelFactory.createModelForGraph(
-                new SpecialBulkUpdateHandlerGraph(
-                        baseDynamicUnion.getGraph(), 
-                        baseOms.getABoxModel().getGraph().getBulkUpdateHandler()) );
-        OntModel baseUnion = ModelFactory.createOntologyModel(
-                OntModelSpec.OWL_MEM, baseDynamicUnion);
-        baseOms.setFullModel(baseUnion);
-        ModelContext.setBaseOntModel(baseOms.getFullModel(), ctx);
-        WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
-        config.setDefaultNamespace(getDefaultNamespace(ctx));
-        WebappDaoFactory baseWadf = new WebappDaoFactorySDB(
-                rdfService, baseOms, config,
-                WebappDaoFactorySDB.SDBDatasetMode.ASSERTIONS_ONLY);
-        ctx.setAttribute("assertionsWebappDaoFactory",baseWadf);
-        
-        OntModel inferenceUnion = ModelFactory.createOntologyModel(
-                OntModelSpec.OWL_MEM,
-                ModelFactory.createUnion(
-                        inferenceOms.getABoxModel(), 
-                        inferenceOms.getTBoxModel()));
-        inferenceOms.setFullModel(inferenceUnion);
-        ModelContext.setInferenceOntModel(inferenceOms.getFullModel(), ctx);
-        WebappDaoFactory infWadf = new WebappDaoFactorySDB(
-                rdfService, inferenceOms, config, 
-                WebappDaoFactorySDB.SDBDatasetMode.INFERENCES_ONLY);
-        ctx.setAttribute("deductionsWebappDaoFactory", infWadf);
-        
-        OntModel masterUnion = ModelFactory.createOntologyModel(
-                DB_ONT_MODEL_SPEC, dataset.getDefaultModel());
-        unionOms.setFullModel(masterUnion);
-        ctx.setAttribute("jenaOntModel", masterUnion);  
-        WebappDaoFactory wadf = new WebappDaoFactorySDB(
-                rdfService, unionOms, config);
-        ctx.setAttribute("webappDaoFactory",wadf);
-
-        ModelContext.setOntModelSelector(unionOms, ctx);
-        ModelContext.setUnionOntModelSelector(unionOms, ctx);          
-                                           // assertions and inferences
-        ModelContext.setBaseOntModelSelector(baseOms, ctx);            
-                                           // assertions
-        ModelContext.setInferenceOntModelSelector(inferenceOms, ctx);  
-                                           // inferences       
-        
-        ctx.setAttribute("defaultNamespace", getDefaultNamespace(ctx));
-        
-        makeModelMakerFromConnectionProperties(TripleStoreType.RDB, ctx);
-        VitroJenaModelMaker vjmm = getVitroJenaModelMaker();
-        setVitroJenaModelMaker(vjmm, ctx);
-        makeModelMakerFromConnectionProperties(TripleStoreType.SDB, ctx);
-        RDFServiceModelMaker vsmm = new RDFServiceModelMaker(rdfServiceFactory);
-        setVitroJenaSDBModelMaker(vsmm, ctx);
-                
-        //bdc34: I have no reason for vsmm vs vjmm.  
-        //I don't know what are the implications of this choice.        
-        setVitroModelSource( new VitroModelSource(vsmm,ctx), ctx);
-        
-        log.info("Model makers set up");
-    }
-
-
-    /**
-     * If we find a "portal1" portal (and we should), its URI should use the
-     * default namespace.
-     */
-    private void checkForNamespaceMismatch(OntModel model, ServletContext ctx) {
-        String expectedNamespace = getDefaultNamespace(ctx);
-
-        List<Resource> portals = getPortal1s(model);
-
-        if(!portals.isEmpty() && noPortalForNamespace(
-                portals, expectedNamespace)) {
-            // There really should be only one portal 1, but if there happen to 
-            // be multiple, just arbitrarily pick the first in the list.
-            Resource portal = portals.get(0); 
-            String oldNamespace = portal.getNameSpace();
-            renamePortal(portal, expectedNamespace, model);
-            StartupStatus ss = StartupStatus.getBean(ctx);
-            ss.warning(this, "\nThe default namespace has been changed \n" +  
-                             "from " + oldNamespace + 
-                             "\nto " + expectedNamespace + ".\n" +
-                             "The application will function normally, but " +
-                             "any individuals in the \n" + oldNamespace + " " + 
-                             "namespace will need to have their URIs \n" +
-                             "changed in order to be served as linked data. " +
-                             "You can use the Ingest Tools \nto change the " +
-                             "URIs for a batch of resources.");
-        }
-    }
-    
-    private List<Resource> getPortal1s(Model model) {
-        List<Resource> portals = new ArrayList<Resource>();
-        try {
-            model.enterCriticalSection(Lock.READ);
-            ResIterator portalIt = model.listResourcesWithProperty(
-                    RDF.type, PORTAL);
-            while (portalIt.hasNext()) {
-                Resource portal = portalIt.nextResource();
-                if ("portal1".equals(portal.getLocalName())) {
-                    portals.add(portal);
-                }
-            }
-        } finally {
-            model.leaveCriticalSection();
-        }
-        return portals;
-    }
-    
-    private boolean noPortalForNamespace(List<Resource> portals, 
-                                         String expectedNamespace) {
-        for (Resource portal : portals) {
-            if(expectedNamespace.equals(portal.getNameSpace())) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private void renamePortal(Resource portal, String namespace, Model model) {
-        model.enterCriticalSection(Lock.WRITE);
-        try {
-            ResourceUtils.renameResource(
-                    portal, namespace + portal.getLocalName());
-        } finally {
-            model.leaveCriticalSection();
-        }
-    }
-    
-
-    /* ===================================================================== */
-    
-    
-    @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-        // Nothing to do.
-    }    
-    
-    private boolean isEmpty(Model model) {
-        ClosableIterator<Statement> closeIt = model.listStatements(
-                null, RDF.type, ResourceFactory.createResource(
-                        VitroVocabulary.PORTAL));
-        try {
-            if (closeIt.hasNext()) {
-                return false;
-            } else {
-                return true;
-            }
-        } finally {
-            closeIt.close();
-        }
-    }
-    
-    private void loadDataFromFilesystem(OntModelSelector baseOms, 
-                                        ServletContext ctx) {
-        Long startTime = System.currentTimeMillis();
-        log.info("Initializing models from RDF files");    
-        
-        readOntologyFilesInPathSet(USER_ABOX_PATH, ctx, baseOms.getABoxModel());
-        readOntologyFilesInPathSet(USER_TBOX_PATH, ctx, baseOms.getTBoxModel());
-        readOntologyFilesInPathSet(
-                USER_APPMETA_PATH, ctx, baseOms.getApplicationMetadataModel());
-        
-        log.debug(((System.currentTimeMillis() - startTime) / 1000)
-                + " seconds to read RDF files ");
-    }
-   
-  
-
- 
- }
-
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
new file mode 100644
index 000000000..cbb3ad258
--- /dev/null
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
@@ -0,0 +1,106 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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.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 edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
+
+public class ApplicationConfigurationOntologyUtils {
+
+    private static final Log log = LogFactory.getLog(ApplicationConfigurationOntologyUtils.class);
+    
+    public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, VitroRequest vreq) {
+        ServletContext ctx = vreq.getSession().getServletContext();
+		Model displayModel = ModelAccess.on(ctx).getDisplayModel();
+        Model tboxModel = ModelAccess.on(ctx).getOntModel(ModelID.UNION_TBOX);
+        return getAdditionalFauxSubpropertiesForList(propList, displayModel, tboxModel);
+    }
+    
+    public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, 
+                                                                         Model displayModel, 
+                                                                         Model tboxModel) {
+        List<ObjectProperty> additionalProps = new ArrayList<ObjectProperty>();
+        Model union = ModelFactory.createUnion(displayModel, tboxModel);
+        String propQuery = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
+                "PREFIX config: <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" +
+                "SELECT ?range ?label ?listView ?group WHERE { \n" +
+        		"    ?p rdfs:subPropertyOf ?property . \n" +
+                "    ?context config:configContextFor ?p . \n" +
+        		"    ?context config:qualifiedBy ?range . \n" +
+                "    ?context config:hasConfiguration ?configuration . \n" +
+        		"    OPTIONAL { ?configuration config:propertyGroup ?group } \n" +
+                "    OPTIONAL { ?configuration config:displayName ?label } \n" +
+        		"    OPTIONAL { ?configuration config:hasListView ?lv . ?lv config:listViewConfigFile ?listView } \n" +
+        		"}"; 
+      
+        for (ObjectProperty op : propList) {
+            log.debug("Checking " + op.getURI() + " for additional properties");
+            String queryStr = propQuery.replaceAll("\\?property", "<" + op.getURI() + ">");
+            log.debug(queryStr);
+            Query q = QueryFactory.create(queryStr);
+            QueryExecution qe = QueryExecutionFactory.create(q, union);
+            try {
+                ResultSet rs = qe.execSelect();
+                while (rs.hasNext()) {
+                    ObjectProperty newProp = new ObjectProperty();
+                    newProp.setURI(op.getURI());
+                    QuerySolution qsoln = rs.nextSolution();
+                    log.debug(qsoln);
+                    Resource rangeRes = qsoln.getResource("range");
+                    if (rangeRes != null) {
+                        newProp.setRangeVClassURI(rangeRes.getURI());
+                    } else {
+                        newProp.setRangeVClassURI(op.getRangeVClassURI());
+                    }
+                    Resource groupRes = qsoln.getResource("group");
+                    if (groupRes != null) {
+                        newProp.setGroupURI(groupRes.getURI());
+                    } else {
+                        newProp.setGroupURI(op.getURI());
+                    }
+                    Literal labelLit = qsoln.getLiteral("label");
+                    if (labelLit != null) {
+                        newProp.setDomainPublic(labelLit.getLexicalForm());
+                    } else {
+                        newProp.setDomainPublic(op.getDomainPublic());
+                    }
+                    Literal listViewLit = qsoln.getLiteral("listView");
+                    if (listViewLit != null) {
+                        // TODO where do we get the list views from?
+                    } else {
+                        // newProp.set
+                    }
+                    additionalProps.add(newProp);
+                }  
+            } finally {
+                qe.close();
+            }
+        }
+        
+        return additionalProps;
+    }
+    
+    
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
index 51d5b9644..a57025796 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/DataGetterBase.java
@@ -1,8 +1,6 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
 
-import java.util.Map;
-
 import javax.servlet.ServletContext;
 
 import org.apache.commons.lang.StringUtils;
@@ -11,9 +9,7 @@ import com.hp.hpl.jena.rdf.model.Model;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaModelMaker;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroJenaSDBModelMaker;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 public abstract class DataGetterBase implements DataGetter {
    
@@ -29,7 +25,7 @@ public abstract class DataGetterBase implements DataGetter {
         }else if( REQUEST_JENA_ONT_MODEL.equals(modelName)){
             return vreq.getJenaOntModel();            
         }else if( CONTEXT_DISPLAY_MODEL.equals(modelName)){
-            return (Model)context.getAttribute( DisplayVocabulary.DISPLAY_ONT_MODEL);            
+        	return ModelAccess.on(context).getDisplayModel();
         }else if( ! StringUtils.isEmpty( modelName)){           
             Model model = JenaIngestController.getModel( modelName, vreq, context);
             if( model == null )
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/solr/SolrResultsParser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/solr/SolrResultsParser.java
index 92a6e9083..30b591c9d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/solr/SolrResultsParser.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/solr/SolrResultsParser.java
@@ -37,13 +37,13 @@ public class SolrResultsParser {
 		List<Map<String, String>> maps = new ArrayList<Map<String, String>>();
 
 		if (queryResponse == null) {
-			log.error("Query response for a search was null");
+			log.debug("Query response for a search was null");
 			return maps;
 		}
 
 		SolrDocumentList docs = queryResponse.getResults();
 		if (docs == null) {
-			log.error("Docs for a search was null");
+			log.debug("Docs for a search was null");
 			return maps;
 		}
 		log.debug("Total number of hits = " + docs.getNumFound());
@@ -65,13 +65,13 @@ public class SolrResultsParser {
 		List<Map<String, String>> maps = new ArrayList<Map<String, String>>();
 
 		if (queryResponse == null) {
-			log.error("Query response for a search was null");
+			log.debug("Query response for a search was null");
 			return maps;
 		}
 
 		SolrDocumentList docs = queryResponse.getResults();
 		if (docs == null) {
-			log.error("Docs for a search was null");
+			log.debug("Docs for a search was null");
 			return maps;
 		}
 		log.debug("Total number of hits = " + docs.getNumFound());
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
index a080cde0b..ac2b6e2a0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
@@ -25,6 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.utils.ApplicationConfigurationOntologyUtils;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.BaseTemplateModel;
 
 /*
@@ -72,13 +73,27 @@ public class GroupedPropertyList extends BaseTemplateModel {
         // so we cannot just rely on getting that list.
         List<ObjectProperty> populatedObjectPropertyList = subject
                 .getPopulatedObjectPropertyList();
+        
+        List<ObjectProperty> additions = ApplicationConfigurationOntologyUtils
+                .getAdditionalFauxSubpropertiesForList(
+                        populatedObjectPropertyList, vreq);
+        if (log.isDebugEnabled()) {
+            for (ObjectProperty t : additions) {
+                log.debug(t.getDomainPublic() + " " + t.getGroupURI());
+            }
+            log.debug("Added " + additions.size() + 
+                    " properties due to application configuration ontology");
+        }
+        
+        populatedObjectPropertyList.addAll(additions);        
+                
         propertyList.addAll(populatedObjectPropertyList);
 
         // If editing this page, merge in object properties applicable to the individual that are currently
         // unpopulated, so the properties are displayed to allow statements to be added to these properties.
         // RY In future, we should limit this to properties that the user has permission to add properties to.
         if (editing) {
-            mergeAllPossibleObjectProperties(populatedObjectPropertyList, propertyList);                   
+            mergeAllPossibleObjectProperties(populatedObjectPropertyList, propertyList);
         }
 
         // Now do much the same with data properties: get the list of populated data properties, then add in placeholders for missing ones 
@@ -108,7 +123,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
                     subject, editing, populatedDataPropertyList,
                     populatedObjectPropertyList));
         }
-
+        
         if (!editing) {
             pruneEmptyProperties();
         }
@@ -351,7 +366,6 @@ public class GroupedPropertyList extends BaseTemplateModel {
             } else {
                 String groupUriForProperty = p.getGroupURI();
                 boolean assignedToGroup = false;
-
                 if (groupUriForProperty != null) {
                     for (PropertyGroup pg : groupList) {
                         String groupUri = pg.getURI();
@@ -359,7 +373,7 @@ public class GroupedPropertyList extends BaseTemplateModel {
                             pg.getPropertyList().add(p);
                             assignedToGroup = true;
                             break;
-                        }
+                        }     
                     }
                 }
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
index 9d6bec0f0..b55d7febf 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel.java
@@ -80,6 +80,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     private PropertyListConfig config;
     private String objectKey;    
     private String sortDirection;
+    private String rangeURI;
     
     ObjectPropertyTemplateModel(ObjectProperty op, Individual subject, VitroRequest vreq, 
             boolean editing)
@@ -89,6 +90,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
         setName(op.getDomainPublic());
         
         sortDirection = op.getDomainEntitySortDirection();
+        rangeURI = op.getRangeVClassURI();
         
         // Get the config for this object property
         try {
@@ -147,8 +149,7 @@ public abstract class ObjectPropertyTemplateModel extends PropertyTemplateModel
     
     protected List<Map<String, String>> getStatementData() {
         ObjectPropertyStatementDao opDao = vreq.getWebappDaoFactory().getObjectPropertyStatementDao();
-        
-        return opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, objectKey, getSelectQuery(), getConstructQueries(), sortDirection);
+        return opDao.getObjectPropertyStatementsForIndividualByProperty(subjectUri, propertyUri, objectKey, rangeURI, getSelectQuery(), getConstructQueries(), sortDirection);
     }
     
     protected abstract boolean isEmpty();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
index d3e46524d..e7e2741d5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/Widget.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.logging.Log;
@@ -107,6 +108,7 @@ public abstract class Widget {
     
     private String processMacroToString(Environment env, String widgetName, Macro macro, Map<String, Object> map) {   
         StringWriter out = new StringWriter();
+        
         try {
             String templateString = macro.getChildNodes().get(0).toString();
             // NB Using this method of creating a template from a string does not allow the widget template to import
@@ -117,8 +119,16 @@ public abstract class Widget {
             // the same key, e.g., "widgetTemplate", since one putTemplate() call will clobber a previous one.
             // We need to give each widget macro template a unique key in the StringTemplateLoader, and check 
             // if it's already there or else add it. Leave this for later.
-            Template template = new Template("widget", new StringReader(templateString), env.getConfiguration());          
-            template.process(map, out);
+            Template template = new Template("widget", new StringReader(templateString), env.getConfiguration());
+            
+            // JB KLUGE The widget is processed in its own environment, which doesn't include these custom attributes.
+            // JB KLUGE Put them in.
+            Environment widgetEnv = template.createProcessingEnvironment(map, out);
+            ServletRequest request = (ServletRequest) env.getCustomAttribute("request");
+			widgetEnv.setCustomAttribute("request", request);
+            widgetEnv.setCustomAttribute("context", env.getCustomAttribute("context"));
+            widgetEnv.setLocale(request.getLocale());
+            widgetEnv.process();
         } catch (Exception e) {
             log.error("Could not process widget " + widgetName, e);
         }
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
index fb32a9728..8d6f38420 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/HasPermissionFactoryTest.java
@@ -29,6 +29,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
 import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * Can we tell whether a user is logged in as root?
@@ -79,7 +80,7 @@ public class HasPermissionFactoryTest extends AbstractTestClass {
 		wdf.setUserAccountsDao(uaDao);
 
 		ctx = new ServletContextStub();
-		ctx.setAttribute("webappDaoFactory", wdf);
+		ModelAccess.on(ctx).setWebappDaoFactory(wdf);
 
 		session = new HttpSessionStub();
 		session.setServletContext(ctx);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
index 2c08c0e16..2ab4e0fff 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsRootUserFactoryTest.java
@@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsRootUser;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * Can we tell whether a user is logged in as root?
@@ -56,7 +57,7 @@ public class IsRootUserFactoryTest extends AbstractTestClass {
 		wdf.setUserAccountsDao(uaDao);
 
 		ctx = new ServletContextStub();
-		ctx.setAttribute("webappDaoFactory", wdf);
+		ModelAccess.on(ctx).setWebappDaoFactory(wdf);
 
 		session = new HttpSessionStub();
 		session.setServletContext(ctx);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsUserFactoryTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsUserFactoryTest.java
index 5a5156b9e..e9c7d59fb 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsUserFactoryTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/identifier/factory/IsUserFactoryTest.java
@@ -19,6 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsUser;
 import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  * The simplest of the IdentifierBundleFactory classes.
@@ -46,7 +47,7 @@ public class IsUserFactoryTest extends AbstractTestClass {
 		wdf.setUserAccountsDao(uaDao);
 
 		ctx = new ServletContextStub();
-		ctx.setAttribute("webappDaoFactory", wdf);
+		ModelAccess.on(ctx).setWebappDaoFactory(wdf);
 
 		session = new HttpSessionStub();
 		session.setServletContext(ctx);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
index 10e937af9..f91f71b37 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
@@ -47,6 +47,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
 import edu.cornell.mannlib.vitro.webapp.controller.authenticate.AuthenticatorStub;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
 import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 
 /**
  */
@@ -147,7 +148,7 @@ public class AuthenticateTest extends AbstractTestClass {
 		webappDaoFactory.setIndividualDao(individualDao);
 
 		servletContext = new ServletContextStub();
-		servletContext.setAttribute("webappDaoFactory", webappDaoFactory);
+		ModelAccess.on(servletContext).setWebappDaoFactory(webappDaoFactory);
 		servletContext.setAttribute(AuthenticatorStub.FACTORY_ATTRIBUTE_NAME,
 				authenticatorFactory);
 
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
index ee63e2845..3b6e103be 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/json/JsonServletTest.java
@@ -28,6 +28,7 @@ import stubs.javax.servlet.http.HttpSessionStub;
 import stubs.org.apache.solr.client.solrj.SolrServerStub;
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
 
 /**
@@ -106,8 +107,7 @@ public class JsonServletTest extends AbstractTestClass {
 		resp = new HttpServletResponseStub();
 
 		wadf = new WebappDaoFactoryStub();
-		req.setAttribute("webappDaoFactory", wadf);
-		ctx.setAttribute("webappDaoFactory", wadf);
+		ModelAccess.on(ctx).setWebappDaoFactory(wadf);
 
 		vcDao = new VClassDaoStub();
 		wadf.setVClassDao(vcDao);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtilsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtilsTest.java
index 7a97f2c99..a6745102c 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtilsTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtilsTest.java
@@ -18,6 +18,7 @@ import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
 
 import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.SimpleOntModelSelector;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
@@ -48,7 +49,7 @@ public class PageDataGetterUtilsTest extends AbstractTestClass{
     @Test
     public void testGetPageDataGetterObjects() throws Exception{
         VitroRequest vreq = new VitroRequest( new HttpServletRequestStub() );
-        vreq.setWebappDaoFactory(wdf);
+        ModelAccess.on(vreq).setWebappDaoFactory(wdf);
         
         List<PageDataGetter> pdgList = PageDataGetterUtils.getPageDataGetterObjects(vreq, pageURI);
         Assert.assertNotNull(pdgList);
@@ -58,7 +59,7 @@ public class PageDataGetterUtilsTest extends AbstractTestClass{
     @Test
     public void testGetNonPageDataGetterObjects() throws Exception{
         VitroRequest vreq = new VitroRequest( new HttpServletRequestStub() );
-        vreq.setWebappDaoFactory(wdf);
+        ModelAccess.on(vreq).setWebappDaoFactory(wdf);
         
         List<PageDataGetter> pdgList = PageDataGetterUtils.getPageDataGetterObjects(vreq, pageURI_2);
         Assert.assertNotNull(pdgList);
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
index 1ab3f53f2..2ae768482 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/ObjectPropertyTemplateModel_PropertyListConfigTest.java
@@ -25,6 +25,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
 import stubs.edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDaoStub;
 import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
 import stubs.freemarker.cache.TemplateLoaderStub;
@@ -36,6 +40,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.InvalidConfigurationException;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.customlistview.PropertyListConfig;
@@ -123,7 +129,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 		hreq.setSession(session);
 
 		vreq = new VitroRequest(hreq);
-		vreq.setWebappDaoFactory(wadf);
+		ModelAccess.on(vreq).setWebappDaoFactory(wadf);
 
 		subject = new IndividualImpl();
 
@@ -273,6 +279,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 	@Test
 	public void constructQueryNodeMissing()
 			throws InvalidConfigurationException {
+		ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, emptyOntModel());
 		op = buildOperation("constructQueryMissing");
 		optm = new NonCollatingOPTM(op, subject, vreq, true);
 		// Not an error.
@@ -281,6 +288,7 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 	@Test
 	public void constructQueryMultipleValues()
 			throws InvalidConfigurationException {
+		ModelAccess.on(vreq).setOntModel(ModelID.UNION_FULL, emptyOntModel());
 		op = buildOperation("constructQueryMultiple");
 		optm = new NonCollatingOPTM(op, subject, vreq, true);
 		assertConstructQueries("multiple construct queries", "ONE", "TWO",
@@ -367,6 +375,10 @@ public class ObjectPropertyTemplateModel_PropertyListConfigTest extends
 	// Helper methods
 	// ----------------------------------------------------------------------
 
+	private OntModel emptyOntModel() {
+		return ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+	}
+
 	/**
 	 * Sets up an operation with name "foobar" and adds it to the
 	 * ObjectPropertyDaoStub.
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
index aebcd0fb1..d5913a557 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyStatementDaoStub.java
@@ -216,7 +216,7 @@ public class ObjectPropertyStatementDaoStub implements
 
 	@Override
 	public List<Map<String, String>> getObjectPropertyStatementsForIndividualByProperty(
-			String subjectUri, String propertyUri, String objectKey,
+			String subjectUri, String propertyUri, String objectKey, String rangeUri,
 			String query, Set<String> constructQueries, String sortDir) {
 		throw new RuntimeException(
 				"ObjectPropertyStatementDaoStub.getObjectPropertyStatementsForIndividualByProperty() not implemented.");
diff --git a/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java b/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
index af27594d7..649e2c1e4 100644
--- a/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
+++ b/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
@@ -12,10 +12,11 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import stubs.javax.servlet.ServletContextStub;
+
 /**
  * A simple stand-in for the HttpSession, for use in unit tests.
  */
-@SuppressWarnings("deprecation")
 public class HttpSessionStub implements HttpSession {
 	private static final Log log = LogFactory.getLog(HttpSessionStub.class);
 
@@ -49,7 +50,11 @@ public class HttpSessionStub implements HttpSession {
 
 	@Override
 	public ServletContext getServletContext() {
-		return this.context;
+		if (this.context == null) {
+			return new ServletContextStub();
+		} else {
+			return this.context;
+		}
 	}
 
 	@Override
@@ -149,6 +154,7 @@ public class HttpSessionStub implements HttpSession {
 				"HttpSessionStub.putValue() not implemented.");
 	}
 
+	@Override
 	public void removeValue(String arg0) {
 		throw new RuntimeException(
 				"HttpSessionStub.removeValue() not implemented.");
diff --git a/webapp/themes/vitro/templates/footer.ftl b/webapp/themes/vitro/templates/footer.ftl
index 29e054ead..eb57f61e5 100644
--- a/webapp/themes/vitro/templates/footer.ftl
+++ b/webapp/themes/vitro/templates/footer.ftl
@@ -7,25 +7,25 @@
         <#if copyright??>
             <small>&copy;${copyright.year?c}
             <#if copyright.url??>
-                <a href="${copyright.url}" title="copyright">${copyright.text}</a>
+                <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
             <#else>
                 ${copyright.text}
             </#if>
-             | <a class="terms" href="${urls.termsOfUse}" title="terms of use">Terms of Use</a></small> | 
+             | <a class="terms" href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a></small> | 
         </#if>
-        Powered by <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
+        ${i18n().powered_by} <a class="powered-by-vitro" href="http://vitro.sourceforge.net"><strong>Vitro</strong></a>
         <#if user.hasRevisionInfoAccess>
-             | Version <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
+             | ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
         </#if>
     </p>
     
     <nav role="navigation">
         <ul id="footer-nav" role="list">
-            <li role="listitem"><a href="${urls.about}" title="about">About</a></li>
+            <li role="listitem"><a href="${urls.about}" title="${i18n().about}">${i18n().about}</a></li>
             <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="contact us">Contact Us</a></li>
+                <li role="listitem"><a href="${urls.contact}" title="${i18n().contact_us}">${i18n().contact_us}</a></li>
             </#if> 
-            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="support">Support</a></li>
+            <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().support}">${i18n().support}</a></li>
         </ul>
     </nav>
 </footer>
diff --git a/webapp/themes/vitro/templates/identity.ftl b/webapp/themes/vitro/templates/identity.ftl
index 297945d43..478452f34 100644
--- a/webapp/themes/vitro/templates/identity.ftl
+++ b/webapp/themes/vitro/templates/identity.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <header id="branding" role="banner">
-    <h1 class="vitro-logo"><a title="VITRO | web-based ontology & instance editor" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
+    <h1 class="vitro-logo"><a title="${siteName}" href="${urls.home}"><span class="displace">${siteName}</span></a></h1>
     <#-- Since we are using a graphic text for the tagline, we won't render ${siteTagline}
     <#if siteTagline?has_content>
         <em>${siteTagline}</em>
@@ -10,19 +10,19 @@
     <nav role="navigation">
         <ul id="header-nav" role="list">
             <#include "languageSelector.ftl">
-            <li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
+            <li role="listitem"><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
             <#if user.loggedIn>
                 <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
+                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().site_admin}">${i18n().site_admin}</a></li>
                 </#if>
                     <li>
                         <ul class="dropdown">
-                            <li id="user-menu"><a href="#" title="user">${user.loginName}</a>
+                            <li id="user-menu"><a href="#" title="${i18n().current_user}">${user.loginName}</a>
                                 <ul class="sub_menu">
                                      <#if urls.myAccount??>
-                                         <li role="listitem"><a href="${urls.myAccount}" title="my account">My account</a></li>
+                                         <li role="listitem"><a href="${urls.myAccount}" title="${i18n().myAccount_heading}">${i18n().myAccount_heading}</a></li>
                                      </#if>
-                                     <li role="listitem"><a href="${urls.logout}" title="log out">Log out</a></li>
+                                     <li role="listitem"><a href="${urls.logout}" title="${i18n().log_out}">${i18n().log_out}</a></li>
                                 </ul>
                             </li>
                          </ul>
@@ -31,7 +31,7 @@
                 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}
                 
             <#else>
-                <li role="listitem"><a class="log-out" title="log in to manage this site" href="${urls.login}">Log in</a></li>
+                <li role="listitem"><a class="log-out" title="${i18n().login_to_manage_site}" href="${urls.login}">${i18n().login_button}</a></li>
             </#if>
         </ul>
         
diff --git a/webapp/themes/vitro/templates/menu.ftl b/webapp/themes/vitro/templates/menu.ftl
index 1f7e501ef..09bb02473 100644
--- a/webapp/themes/vitro/templates/menu.ftl
+++ b/webapp/themes/vitro/templates/menu.ftl
@@ -5,7 +5,7 @@
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
-            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if>>${item.linkText}</a></li>
+            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="${i18n().menu_item}">${item.linkText}</a></li>
         </#list>
     </ul>
 </nav>
@@ -25,6 +25,6 @@
     
     <!--[if lte IE 8]>
     <noscript>
-        <p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">instructions for enabling JavaScript in your web browser</a>.</p>
+        <p class="ie-alert">${i18n().javascript_ie_alert_text} Here are the <a href="http://www.enable-javascript.com" title="javascript instructions">${i18n().to_enable_javascript}</a>.</p>
     </noscript>
     <![endif]-->
\ No newline at end of file
diff --git a/webapp/themes/vitro/templates/page-home.ftl b/webapp/themes/vitro/templates/page-home.ftl
index 0e3ab91f4..85b519eca 100644
--- a/webapp/themes/vitro/templates/page-home.ftl
+++ b/webapp/themes/vitro/templates/page-home.ftl
@@ -15,34 +15,34 @@
         <#include "menu.ftl">
         
             <section id="intro" role="region">
-                <h2>What is VITRO?</h2>
+                <h2>${i18n().what_is_vitro}</h2>
                 
-                <p>Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. Vitro is a Java web application that runs in a Tomcat servlet container.</p>
-                <p>With Vitro, you can:</p>
+                <p>${i18n().vitro_description}</p>
+                <p>${i18n().with_vitro}</p>
                 
                 <ul>
-                    <li>Create or load ontologies in OWL format</li>
-                    <li>Edit instances and relationships</li>
-                    <li>Build a public web site to display your data</li>
-                    <li>Search your data</li>
+                    <li>${i18n().vitro_bullet_one}</li>
+                    <li>${i18n().vitro_bullet_two}</li>
+                    <li>${i18n().vitro_bullet_three}</li>
+                    <li>${i18n().vitro_bullet_four}</li>
                 </ul>
                 
                 <section id="search-home" role="region">
-                    <h3>Search VITRO <span class="search-filter-selected">filteredSearch</span></h3>
+                    <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
                     
                     <fieldset>
-                        <legend>Search form</legend>
+                        <legend>${i18n().search_form}</legend>
                         <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="post" > 
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />
-                                <input type="submit" value="Search" class="search" />
+                                <input type="submit" value="${i18n().search_button}" class="search" />
                                 <input type="hidden" name="classgroup" class="search-homepage" value="" autocapitalize="off" />
                             </div>
                             
-                            <a class="filter-search filter-default" href="#" title="Filter search"><span class="displace">filter search</span></a>
+                            <a class="filter-search filter-default" href="#" title="${i18n().filter_search}"><span class="displace">${i18n().filter_search}</span></a>
                             
                             <ul id="filter-search-nav">
-                                <li><a class="active" href="">All</a></li>
+                                <li><a class="active" href="">${i18n().all_capitalized}</a></li>
                                 <@lh.allClassGroupNames vClassGroups! />
                             </ul>
                         </form>
diff --git a/webapp/themes/vitro/templates/page.ftl b/webapp/themes/vitro/templates/page.ftl
index 2f204e6f8..f234c0dac 100644
--- a/webapp/themes/vitro/templates/page.ftl
+++ b/webapp/themes/vitro/templates/page.ftl
@@ -13,12 +13,12 @@
         
         <section id="search" role="region">
             <fieldset>
-                <legend>Search form</legend>
+                <legend>${i18n().search_form}</legend>
 
                 <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
                     <div id="search-field">
                         <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
-                        <input type="submit" value="Search" class="search">
+                        <input type="submit" value="${i18n().search_button}" class="search">
                     </div>
                 </form>
             </fieldset>
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index 251a26458..202508ebd 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/WEB-INF/resources/startup_listeners.txt
@@ -20,8 +20,8 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.RDFServiceSetup
 
 edu.cornell.mannlib.vitro.webapp.servlet.setup.ApplicationModelSetup
 edu.cornell.mannlib.vitro.webapp.servlet.setup.UserModelSetup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.WebappDaoSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ModelMakerSetup
 
 edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
 
diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml
index 4b6b83b84..e5bb91e40 100644
--- a/webapp/web/WEB-INF/web.xml
+++ b/webapp/web/WEB-INF/web.xml
@@ -88,6 +88,17 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+  <!-- If language support is enabled, this must not precede the LocaleSelectionFilter -->
+  <filter>
+    <description>Recognize conditional requests, and generate Cache-Control headers.</description>
+    <filter-name>Caching Response filter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.CachingResponseFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>Caching Response filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <filter>
     <filter-name>JSession Strip Filter</filter-name>
     <filter-class>edu.cornell.mannlib.vitro.webapp.filters.JSessionStripFilter</filter-class>
diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp
index f8d0796cb..301b105e3 100644
--- a/webapp/web/admin/conceptRepair.jsp
+++ b/webapp/web/admin/conceptRepair.jsp
@@ -3,6 +3,7 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
@@ -21,7 +22,7 @@
     		"    FILTER(afn:bnode(?bnode) = \"" + conceptIdStr + "\")\n" +
     	    "}";
     	    
-    	OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+    	OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
     	Model conceptDescription = ModelFactory.createDefaultModel();
     	try {
     		ontModel.enterCriticalSection(Lock.READ);
diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp
index 6954e50d0..18e8e78d8 100644
--- a/webapp/web/admin/removeBadRestrictions.jsp
+++ b/webapp/web/admin/removeBadRestrictions.jsp
@@ -4,12 +4,13 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
 <%
     if (request.getParameter("execute") != null) {
-    	OntModel ontModel = (OntModel) getServletContext().getAttribute(JenaBaseDao.ASSERTIONS_ONT_MODEL_ATTRIBUTE_NAME);
+     	OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
     	int results = doRemoval(ontModel);
     	request.setAttribute("removalCount", results);
     }
@@ -66,7 +67,7 @@
             "    FILTER(afn:bnode(?bnode) = \"" + bnodeId + "\")\n" +
             "}";
             
-        OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+    	OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
         Model conceptDescription = ModelFactory.createDefaultModel();
         try {
             ontModel.enterCriticalSection(Lock.READ);
diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp
index 080fb5f63..874e1f0cb 100644
--- a/webapp/web/admin/removeResourceDescription.jsp
+++ b/webapp/web/admin/removeResourceDescription.jsp
@@ -6,6 +6,7 @@
 
 <%@taglib prefix="vitro" uri="/WEB-INF/tlds/VitroUtils.tld" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
+<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <% request.setAttribute("requestedActions", SimplePermission.USE_MISCELLANEOUS_CURATOR_PAGES.ACTION); %>
 <vitro:confirmAuthorization />
 
@@ -16,7 +17,7 @@
         String describeQueryStr = 
             "DESCRIBE <" + resourceURIStr + ">";
             
-        OntModel ontModel = (OntModel) getServletContext().getAttribute("baseOntModel");
+    	OntModel ontModel = ModelAccess.on(getServletContext()).getBaseOntModel();
         Model resourceDescription = ModelFactory.createDefaultModel();
         try {
             ontModel.enterCriticalSection(Lock.READ);
diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp
index d97aa3f56..5f2acffbc 100644
--- a/webapp/web/admin/syncSesame.jsp
+++ b/webapp/web/admin/syncSesame.jsp
@@ -7,6 +7,7 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaModelUtils"%>
 <%@page import="com.hp.hpl.jena.rdf.model.Model"%>
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%>
+<%@page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@page import="java.io.InputStream"%>
 <%@page import="java.util.Properties"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
@@ -54,7 +55,7 @@
     }
     String contextId = sesameProperties.getProperty(SESAME_CONTEXT);
     
-    Model fullModel = (Model) getServletContext().getAttribute(JenaBaseDao.JENA_ONT_MODEL_ATTRIBUTE_NAME);
+    Model fullModel = ModelAccess.on(getServletContext()).getJenaOntModel();
     // Copy the model to avoid locking the main model during sync.  Assumes enough memory.
     Model copyModel = ModelFactory.createDefaultModel();
     fullModel.enterCriticalSection(Lock.READ);
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index ad5ec0618..8cfa57c7a 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -125,7 +125,7 @@ initial_password = Initial password
 submit_add_new_account = Add new account
 
 account_created = Your {0} account has been created.
-account_created_subject Your {0} account has been created.
+account_created_subject = Your {0} account has been created.
 account_created_email_html = @@file files/accountCreatedEmail.html
 account_created_email_text = @@file files/accountCreatedEmail.txt
 account_created_external_email_html = @@file files/accountCreatedExternalOnlyEmail.html
@@ -168,7 +168,7 @@ reset_your_password = Reset your Password
 first_time_login = First time log in
 create_account = Create account
 
-cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. 
+cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. \
                 Please log out and try again.
 account_already_activated = The account for {0} has already been activated.
 
@@ -183,7 +183,7 @@ password_saved_please_login	= Your password has been saved. Please log in.
 
 
 please_provide_contact_information = Please provide your contact information to finish creating your account.
-first_time_login_note = Note: An email will be sent to the address entered above notifying \ 
+first_time_login_note = Note: An email will be sent to the address entered above notifying \
                 that an account has been created.
 first_time_external_email_html = @@file files/accountFirstTimeExternal.html
 first_time_external_email_text = @@file files/accountFirstTimeExternal.txt
@@ -192,7 +192,7 @@ myAccount_heading = My account
 myAccount_confirm_changes = Your changes have been saved.
 myAccount_confirm_changes_plus_note = Your changes have been saved. A confirmation email has been sent to {0}.
 email_change_will_be_confirmed = Note: if email changes, a confirmation email will be sent to the new email address entered above.
-email_changed_subject = "Your VIVO email account has been changed.");
+#email_changed_subject = "Your VIVO email account has been changed.");
 			
 who_can_edit_profile = Who can edit my profile
 add_profile_editor = Add profile editor
@@ -215,4 +215,528 @@ error_no_role = You must select a role.
 error_no_password = No password supplied.
 error_password_length = Password must be between {0} and {1} characters.
 error_password_mismatch = Passwords do not match.
-					
\ No newline at end of file
+
+#
+# "partial" individual templates ( /templates/freemarker/body/partials/individual ) 
+#
+manage_publications = manage publications
+manage_grants_and_projects = manage grants & projects
+manage_affiliated_people = manage affiliated people
+
+group_name = group name
+scroll_to_menus = scroll to property group menus
+properties_capitalized = Properties
+properties = properties
+view_all_capitalized = View All
+
+name = name
+
+admin_panel = Admin Panel
+edit_this_individual = Edit this individual
+verbose_status_on = on
+verbose_status_off = off
+verbose_property_status = Verbose property display is
+verbose_control = verbose control
+verbose_turn_on = Turn on
+verbose_turn_off = Turn off
+resource_uri = Resource URI
+
+individual_not_found = Individual not found:
+entity_to_query_for = This id is the id of the entity to query for. netid also works.
+
+menu_ordering = Menu Ordering
+refresh_page_after_reordering = Refresh page after reordering menu items
+display_has_element_error = There was an error in the system. The display:hasElement property could not be retrieved.
+
+return_to = return to {0}
+
+#
+# admin templates ( /templates/freemarker/body/admin )
+#
+logins_already_restricted = Logins are already restricted.
+logins_not_already_restricted = Logins are already not restricted.
+logins_restricted = Logins are now restricted.
+logins_not_restricted = Logins are no longer restricted.
+remove_restrictions = Remove Restrictions
+restrict_logins = Restrict Logins
+error_alert_icon = Error alert icon
+
+current_user = Current user
+external_auth_id = External Auth ID
+user_role = Role
+not_logged_in = Not logged in
+identifiers = Identifiers
+associated_individuals = Associated Individuals
+match_by = match by {0}
+matching_prop_not_defined = matching property is not defined
+may_edit = May edit
+may_not_edit = May not edit
+none = none
+identifier_factories = Identifier factories
+policies = Policies
+authenticator = Authenticator
+
+background_threads = Background Threads
+name_capitalized = Name
+work_level = Work level
+since = Since
+flags = Flags
+
+search_index_status = Search Index Status
+search_index_not_connected = The search index is not connected.
+failed = failed
+check_startup_status = Check startup status page and/or Tomcat logs for more information.
+search_indexer_idle = The search indexer is idle.
+most_recent_update = The most recent update was at 
+rebuild_button = Rebuild
+reset_search_index = Reset the search index and re-populate it.
+preparing_to_rebuild_index = Preparing to rebuild the search index.
+since_elapsed_time = since {0}, elapsed time {1}
+current_task = {0} the search index
+since_elapsed_time_est_total = since {0}, elapsed time {1}, estimated total time {2}
+index_recs_completed = Completed {0} out of {1} index records.
+
+fatal_error = Fatal Error
+fatal_error_detected = {0} detected a fatal error during startup.
+warning = Warning
+warnings_issued = {0} issued warnings during startup.
+startup_trace = Startup trace
+full_list_startup = The full list of startup events and messages.
+startup_status = Startup Status
+continue = Continue
+
+#
+# contact form templates ( /templates/freemarker/body/contactForm )
+#
+rejected_spam = REJECTED - SPAM
+feedback_thanks_heading = Thank you for your feedback
+feedback_thanks_text = Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.
+return_to_the = Return to the
+home_page = home page
+from_capitalized = From
+ip_address = IP address
+viewing_page = Likely viewing page
+comments = Comments
+interest_thanks = Thank you for your interest in {0}. Please submit this form with questions, comments, or feedback about the content of this site.
+full_name = Full name
+comments_questions = Comments, questions, or suggestions
+enter_in_security_field = Please enter the letters displayed below into the security field
+send_mail = Send Mail
+
+#
+# display edit template ( /templates/freemarker/body/displayEdit )
+#
+display_admin_header = Display Admin and Configuration
+
+#
+# error templates ( /templates/freemarker/body/error )
+#
+we_have_an_error = There was an error in the system.
+error_was_reported = This error has been reported to the site administrator.
+error_message = Error message
+stack_trace = Stack trace
+trace_available = full trace available in the vivo log
+caused_by = Caused by
+requested_url = Requested url
+error_occurred = An error occurred on the VIVO site
+error_occurred_at = An error occurred on your VIVO site at {0}.
+
+#
+# login templates ( /templates/freemarker/body/login )
+#
+internal_login = Internal Login
+no_email_supplied = No email supplied.
+no_password_supplied = No password supplied.
+logins_temporarily_disabled = User logins are temporarily disabled while the system is being maintained.
+incorrect_email_password = Email or Password was incorrect.
+password_length = Password must be between 6 and 12 characters.
+password_mismatch = Passwords do not match.
+new_pwd_matches_existing = Your new password must be different from your existing password.
+enter_email_password = Enter the email address and password for your internal Vitro account.
+change_password = You must change your password to log in.
+email_capitalized = Email
+password_capitalized = Password
+login_button = Log in
+fake_external_auth = Fake External Authentication
+enter_id_to_login = Enter the userID that you want to sign in as, or click Cancel.
+username = Username
+submit_button = Submit
+
+#
+# body templates ( /templates/freemarker/body )
+#
+class_name = class name
+continued = cont'd
+
+expecting_content = Expecting content?
+try_rebuilding_index = Try rebuilding the search index
+
+please = Please
+login_to_manage_site = log in to manage this site
+log_in = log in
+to_manage_content = to manage content.
+no_content_in_system = There is currently no {0} content in the system
+you_can = You can
+add_content_manage_site = add content and manage this site
+from_site_admin_page = from the Site Administration page.
+view_list_in_rdf = View the {0} list in RDF format
+rdf = RDF
+pages = pages
+
+menu_management = Menu Management
+setup_navigation_menu = Setup the primary navigation menu for your website
+save_button = Save
+
+recompute_inferences = Recompute Inferences
+
+revision_info = Revision Information
+levels = Levels
+release = release
+revision = revision
+build_date = Build date
+
+dates = Dates
+current_date_time = Current date & time:
+current_date = Current date:
+current_time = Current time:
+formatted_date_time = Formatted date-time
+apples = Apples
+fruit = Fruit
+animal = Animal:
+book_title = Book Title:
+zoo_one = Zoo 1
+zoo_two = Zoo 2
+berries = Berries:
+raw_string_literals = Raw String Literals
+containers_do_not_pick_up_changes = Containers do not pick up changes to the value of their elements
+list_elements_of = List elements of
+contains_no_pears = contains no pears
+numbers = Numbers
+undo_camelcasing = Uncamelcasing
+
+run_sdb_setup = Run SDB Setup
+
+unrecognized_user = Unrecognized user
+no_individual_associated_with_id = For some reason, there is no individual in VIVO that is associated with your Net ID. Perhaps you should contact your VIVO administrator.
+
+#
+# site admin templates ( /templates/freemarker/body/siteAdmin )
+#
+advanced_data_tools = Advanced Data Tools
+add_remove_rdf = Add/Remove RDF data
+ingest_tools = Ingest tools
+rdf_export = RDF export
+sparql_query = SPARQL query
+sparql_query_builder = SPARQL query builder
+
+display_options = Display Options
+asserted_class_hierarchy = Asserted Class Hierarchy
+inferred_class_hierarchy = Inferred Class Hierarchy
+all_classes = All Classes
+classes_by_classgroup = Classes by Class Group
+add_new_classes = Add New Class
+add_new_group = Add New Group
+hide_show_subclasses = hide/show subclasses
+hide_subclasses = hide subclasses
+expand_all = expand all
+
+data_input = Data Input
+add_individual_of_class = Add individual of this class
+create_classgroup = Create a class group
+please_create = Please create
+a_classgroup = a class group
+associate_classes_with_group = and associate classes with the group created.
+
+refresh_content = Refresh Content
+rebuild_search_index = Rebuild search index
+rebuild_vis_cache = Rebuild visualization cache
+recompute_inferences_mixed_caps = Recompute inferences
+
+site_administration = Site Administration
+
+add_property_group = Add new property group
+hide_show_properties = hide/show properties
+hide_properties = hide properties
+property_hierarchy = Property Hierarchy
+all_x_properties = All {0} Properties
+property_groups = Property Groups
+add_new = Add new
+object = object
+data = data
+property = property
+
+ontology_editor = Ontology Editor
+cause = Cause:
+ontology_list = Ontology list
+class_management = Class Management
+class_hierarchy = Class hierarchy
+class_groups = Class groups
+property_management = Property Management
+object_property_hierarchy = Object property hierarchy
+data_property_hierarchy = Data property hierarchy
+
+site_config = Site Configuration
+internal_class = Institutional internal class
+manage_profile_editing = Manage profile editing
+page_management = Page management
+menu_ordering_mixed_caps = Menu ordering
+restrict_logins_mixed_caps = Restrict logins
+site_information = Site information
+user_accounts = User accounts
+
+#
+# search templates ( /templates/freemarker/body/search )
+#
+search_results_for = Search results for
+limited_to_type = limited to type
+search_help = search help
+not_expected_results = Not the results you expected?
+display_only = Display Only
+class_group_link = class group link
+limit = Limit
+limit_to = Limit to
+class_link = class link
+previous = Previous
+page_link = page link
+next_capitalized = Next
+
+#
+# shortview templates ( /templates/freemarker/body/partials/shortview ) 
+#
+view_profile_page_for = View the profile page for
+
+#
+# menupage templates ( /templates/freemarker/body/partials/menupage ) 
+#
+browse_page_javascript_one = This browse page requires javascript, but your browser is set to disable javascript. Either enable javascript or use the
+browse_page_javascript_two = to browse for information.
+index_page = index page
+
+browse_all_in_class = Browse all individuals in this class
+select_all = select all
+all = all
+browse_all_starts_with = Browse all individuals whose name starts with {0}
+browse_all_public_content = You can browse all of the public content currently in the system using the
+browse_all_content = browse all content
+
+#
+# partial templates ( /templates/freemarker/body/partials ) 
+#
+no_content_create_groups_classes = There is currently no content in the system, or you need to create class groups and assign your classes to them.
+browse_capitalized = Browse
+browse_by = Browse by
+
+#
+# partial account templates ( /templates/freemarker/body/partials/accounts ) 
+#
+delete_button = Delete
+accounts = accounts
+accounts_per_page = accounts per page
+update_button = Update
+
+#
+# pagemanagement templates ( /templates/freemarker/body/pagemanagement ) 
+#
+title_capitalized = Title
+uri_not_defined = URI for page not defined
+page_uri = page URI
+no_pages_defined = There are no pages defined yet.
+add_page = Add Page
+
+custom_template = Custom Template
+menu_page = Menu Page
+controls = Controls
+listed_page_title = listed page title
+untitled = -untitled-
+delete_page = delete this page
+view_profile_for_page = view the individual profile for this page
+menu_orering = Menu Ordering
+use_capitalized = Use
+to_order_menu_items = to set the order of menu items.
+
+#
+# menupage templates ( /templates/freemarker/body/menupage ) 
+#
+page_not_configured = This page is not yet configured.
+implement_capitalized = Implement
+a_link = a link
+configure_page_if_permissable = to configure this page if the user has permission.
+
+no_html_specified = No HTML specified.
+page_text = page text
+
+sparql_query_results = Sparql Query Results
+no_results_returned = No results were returned. 
+
+#
+# manage proxies templates ( /templates/freemarker/body/manageproxies ) 
+#
+operation_successful = The operation was successful.
+operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
+relate_editors_profiles = Relate profile editors and profiles
+info_icon = info icon
+profile_editing_title = The editors you select on the left hand side will have the ability to edit the VIVO profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each.
+select_editors = Select editors
+select_last_name = Select an existing last name
+processing_indicator = processing time indicator
+type_more_chars = type more character
+select_profiles = Select profiles
+profile_editors = Profile editors
+search_button = Search
+view_profile_editors = View all profile editors
+delete_profile_editor = Delete profile editor
+add_profile = Add profile
+selected_profiles = Selected profiles
+save_profile_changes = Save changes to profiles
+
+#
+# page partials templates ( /templates/freemarker/page/partials ) 
+#
+copyright = copyright
+all_rights_reserved = All Rights Reserved.
+terms_of_use = Terms of Use
+
+site_name = site name
+end_your_Session = End your session
+log_out = Log out
+manage_site = Manage this site
+site_admin = Site Admin
+more_details_about_site = More details about this site
+about = About
+contact_us = Contact Us
+send_feedback_questions = Send us your feedback or ask a question
+visit_project_website = Visit the national project web site
+support = Support
+view_content_index = View an outline of the content in this site
+index = Index
+search_form = Search form
+
+select_locale = select locale
+menu_item = menu item
+version = Version
+
+#
+# widget templates ( /templates/freemarker/widgets ) 
+#
+individual_name = individual name
+vclassAlpha_not_implemented = vclassAlpha is not yet implemented.
+
+test_for_logged_in_users = This is the test widget for logged-in users.
+test_for_nonlogged_in_users = This is the test widget for non-logged-in users.
+login_status = Login status:
+
+alert_icon = Alert Icon
+javascript_require_to_edit = In order to edit content, you'll need to enable JavaScript.
+javascript_instructions = java script instructions
+to_enable_javascript = Here are the instructions for enabling JavaScript in your web browser
+external_auth_name = external authentication name
+account = account
+change_password_to_login = Change Password to Log in
+new_password_capitalized = New Password
+confirm_password_capitalized = Confirm Password
+minimum_six_chars = Minimum of 6 characters in length.
+already_logged_in = You are already logged in.
+
+#
+# lib templates ( /templates/freemarker/lib ) 
+#
+statistics = Statistics
+
+manage_list_of = Manage list of
+manage = manage
+add = add
+entry = entry
+edit_entry = edit this entry
+delete_entry = delete this entry
+click_to_view_larger = click to view larger image
+photo = Photo
+no_image = no image
+placeholder_image = placeholder image
+manage_labels = manage labels
+
+unsupported_ie_version = This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or switch to another browser, such as FireFox.
+
+#
+# edit templates ( /templates/freemarker/edit and edit/forms ) 
+#
+edit_capitalized = Edit
+add_capitalized = Add
+create_entry = Create Entry
+select_existing_collaborator = Select an existing Collaborator for {0}
+selected = Selected
+change_selection = change selection
+there_are_no_entries_for_selection = There are no entries in the system from which to select.
+editing_prohibited = This property is currently configured to prohibit editing.
+confirm_entry_deletion_from = Are you sure you want to delete the following entry from
+
+edit_date_time_value = Edit Date/Time Value
+create_date_time_value = Create Date/Time Value
+date_time_value_for = date time value for
+start_interval_must_precede_end_earlier = The Start interval must be earlier than the End interval.
+end_interval_must_follow_start_interval = The End interval must be later than the Start interval.
+start_capitalized = Start
+end_capitalized = End
+create_capitalized = Create
+delete_entry_capitalized = Delete this entry?
+add_new_of_type = Add a new item of this type
+create_new_entry = Please create a new entry.
+no_appropriate_entry = If you don't find the appropriate entry on the selection list above
+
+remove_menu_item = Remove menu item
+confirm_menu_item_delete = Are you sure you want to remove
+
+pretty_url = Pretty URL
+start_with_leading_slash = Must begin with a leading forward slash: / (e.g., /people)
+default = Default
+custom_template_mixed_caps = Custom template
+change_content_type = Change content type
+select_page_content_type = Select content type for the associated page
+select_content_display = Select content to display
+all_capitalized = All
+template_capitalized = Template
+selected_page_content_type = Selected content type for the associated page
+
+create_new = Create a new
+enter_value_name_field = Please enter a value in the name field.
+class_group_all_caps = Class Group
+save_this_content = Save this content
+enter_fixed_html_here = Enter fixed HTML here
+
+query_model = Query Model
+variable_name_all_caps = Variable Name
+enter_sparql_query_here = Enter SPARQL query here
+add_new_page = Add New Page
+save_new_page = Save new page
+edit_page = Edit {0} Page
+content_type = Content Type
+select_type = Select a type
+browse_class_group = Browse Class Group
+fixed_html = Fixed HTML
+add_types = Add one or more types
+begin_with_slash_no_example = Must begin with a leading forward slash: /
+slash_example = (e.g., /people)
+custom_template_requiring_content = Custom template requiring content
+custom_template_containing_content = Custom template containing all content
+a_menu_page = This is a menu page
+menu_item_name = Menu Item Name
+if_blank_page_title_used = If left blank, the page title will be used.
+
+label = label
+no_classes_to_select = There are no Classes in the system from which to select.
+
+#
+# vitro theme templates ( /themes/vitro/templates ) 
+#
+powered_by = Powered by
+javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser.
+
+what_is_vitro = What is VITRO?
+vitro_description = Vitro is a general-purpose web-based ontology and instance editor with customizable public browsing. Vitro is a Java web application that runs in a Tomcat servlet container.
+with_vitro = With Vitro, you can:
+vitro_bullet_one = Create or load ontologies in OWL format
+vitro_bullet_two = Edit instances and relationships
+vitro_bullet_three = Build a public web site to display your data
+vitro_bullet_four = Search your data
+search_vitro = Search VITRO
+filter_search = filter search
+
diff --git a/webapp/web/i18n/all_es.properties b/webapp/web/i18n/all_es.properties
index ecb295fec..6828b8a80 100644
--- a/webapp/web/i18n/all_es.properties
+++ b/webapp/web/i18n/all_es.properties
@@ -39,5 +39,4 @@ delete_link = Borrar foto
 submit_upload = Subir foto
 submit_save = Guardar foto
 
-confirm_delete = ¿Seguro que quiere borrar esta foto?
-
+confirm_delete = ¿Seguro que quiere borrar esta foto?
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp
index 46aeeecc2..8f5751f83 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
@@ -23,7 +24,7 @@
         <select name="workflowURI">
              
         <%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("workflows");
diff --git a/webapp/web/jenaIngest/sparqlConstruct.jsp b/webapp/web/jenaIngest/sparqlConstruct.jsp
index 0c1652e59..fd0914584 100644
--- a/webapp/web/jenaIngest/sparqlConstruct.jsp
+++ b/webapp/web/jenaIngest/sparqlConstruct.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual"%>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel"%>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker"%>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock"%>
 <%@ page import="java.util.Iterator"%>
 <%@ page import="java.util.List"%>
@@ -46,7 +47,7 @@
 <h3>SPARQL Query <select name="savedQuery">
 	<option value="">select saved query</option>
 	<%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List savedQueries = (List) request.getAttribute("savedQueries");
diff --git a/webapp/web/jenaIngest/workflowStep.jsp b/webapp/web/jenaIngest/workflowStep.jsp
index 9ea99e7ae..360093eb2 100644
--- a/webapp/web/jenaIngest/workflowStep.jsp
+++ b/webapp/web/jenaIngest/workflowStep.jsp
@@ -3,6 +3,7 @@
 <%@ page import="com.hp.hpl.jena.ontology.Individual" %>
 <%@ page import="com.hp.hpl.jena.ontology.OntModel" %>
 <%@ page import="com.hp.hpl.jena.rdf.model.ModelMaker" %>
+<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
 <%@ page import="com.hp.hpl.jena.shared.Lock" %>
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
@@ -25,7 +26,7 @@
 		<select name="workflowStepURI">
              
         <%
-              OntModel jenaOntModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
+              OntModel jenaOntModel = ModelAccess.on(getServletContext()).getJenaOntModel();
               jenaOntModel.enterCriticalSection(Lock.READ);
               try {
                   List workflowSteps  = (List) request.getAttribute("workflowSteps");
diff --git a/webapp/web/js/individual/propertyGroupControls.js b/webapp/web/js/individual/propertyGroupControls.js
index 6da441d5f..26f0b91e5 100644
--- a/webapp/web/js/individual/propertyGroupControls.js
+++ b/webapp/web/js/individual/propertyGroupControls.js
@@ -5,7 +5,7 @@ $(document).ready(function(){
     $.extend(this, individualLocalName);
     adjustFontSize();
     padSectionBottoms();
-    retrieveLocalStorage();
+    checkLocationHash();
     
     // ensures that shorter property group sections don't cause the page to "jump around"
     // when the tabs are clicked
@@ -59,6 +59,61 @@ $(document).ready(function(){
         });        
     }
    
+    // If users click a marker on the home page map, they are taken to the profile
+    // page of the corresponding country. The url contains the word "Research" in
+    // the location hash. Use this to select the Research tab, which displays the
+    // researchers who have this countru as a geographic focus.
+    function checkLocationHash() {
+        if ( location.hash ) {
+            // remove the trailing white space
+            location.hash = location.hash.replace(/\s+/g, '');
+            if ( location.hash.indexOf("map") >= 0 ) {  
+                // get the name of the group that contains the geographicFocusOf property.
+                var tabName = $('h3#geographicFocusOf').parent('article').parent('div').attr("id");
+                tabName = tabName.replace("Group","");
+                tabNameCapped = tabName.charAt(0).toUpperCase() + tabName.slice(1);
+                // if the name of the first tab section = tabName we don't have to do anything;
+                // otherwise, select the correct tab and deselect the first one
+                var $firstTab = $('li.clickable').first();
+                if ( $firstTab.text() != tabNameCapped ) {
+                    // select the correct tab
+                    $('li[groupName="' + tabName + '"]').removeClass("nonSelectedGroupTab clickable");
+                    $('li[groupName="' + tabName + '"]').addClass("selectedGroupTab clickable");
+                    // deselect the first tab
+                    $firstTab.removeClass("selectedGroupTab clickable");
+                    $firstTab.addClass("nonSelectedGroupTab clickable");
+                    $('section.property-group:visible').hide();
+                    // show the selected tab section
+                    $('section#' + tabName).show();                
+                }
+                // if there is a more link, "click" more to show all the researchers
+                // we need the timeout delay so that the more link can get rendered                
+                setTimeout(geoFocusExpand,250);
+            }
+            else {
+                retrieveLocalStorage();
+            }            
+        }
+        else {
+            retrieveLocalStorage();
+        }
+    }
+
+    function geoFocusExpand() {
+        // if the ontology is set to collate by subclass, $list.length will be > 0 
+        // this ensures both possibilities are covered
+        var $list = $('ul#geographicFocusOfList').find('ul');
+        if ( $list.length > 0 )
+        {
+            var $more = $list.find('a.more-less');
+            $more.click();
+        }
+        else {
+            var $more = $('ul#geographicFocusOfList').find('a.more-less');
+            $more.click();
+        }
+    }
+    
     //  Next two functions --  keep track of which property group tab was selected,
     //  so if we return from a custom form or a related individual, even via the back button,
     //  the same property group will be selected as before.
@@ -96,15 +151,16 @@ $(document).ready(function(){
     }
 
     function retrieveLocalStorage() {
+        
         var localName = this.individualLocalName;
         var selectedTab = amplify.store(individualLocalName);
         
         if ( selectedTab != undefined ) {
             var groupName = selectedTab[0];
             
-            // unlikely, but it's possible a tab that was previously selected and stored won't be displayed
-            // because the object properties would have been deleted (in non-edit mode). So ensure that the tab in local
-            // storage has been rendered on the page.     
+            // unlikely, but it's possible a tab that was previously selected and stored won't be 
+            // displayed because the object properties would have been deleted (in non-edit mode). 
+            // So ensure that the tab in local storage has been rendered on the page.     
             if ( $("ul.propertyTabsList li[groupName='" + groupName + "']").length ) { 
                 // if the selected tab is the default first one, don't do anything
                 if ( $('li.clickable').first().attr("groupName") != groupName ) {   
@@ -136,7 +192,7 @@ $(document).ready(function(){
             width += $(this).outerWidth();
         });
         if ( width < 922 ) {
-            var diff = 926-width;
+            var diff = 927-width;
             $('ul.propertyTabsList li:last-child').css('width', diff + 'px');
         }
         else {
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index 9ec2e5a22..2397b4fc0 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -30,7 +30,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index 3b5a54ea5..457ddb8d2 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -16,7 +16,7 @@
 
 <#if errorMessage?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}"/>
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}"/>
         <p>${errorMessage}</p>
     </section>
 </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index a871b8090..df5ad40c6 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -30,7 +30,7 @@
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index 96bdb70eb..46f038772 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -20,7 +20,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index 8f8c8bd00..346269405 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -28,7 +28,7 @@
 
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}" />
             <p>${errorMessage}</p>
         </section>
     </#if>
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
index 0ca4be7b6..80fb7cc18 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
@@ -18,7 +18,7 @@
 
 <#if errorMessage?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${strings.alt_error_alert}"/>
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${strings.alt_error_alert}"/>
         <p>${errorMessage}</p>
     </section>
 </#if>
diff --git a/webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl b/webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl
index bcea8f669..3d806fdbe 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-restrictLogins.ftl
@@ -4,26 +4,26 @@
 
 <h2>Restrict Logins</h2>
     <#if messageAlreadyRestricted??>
-        <#assign errorMessage = "Logins are already restricted." />
+        <#assign errorMessage = "${i18n().logins_already_restricted}" />
     </#if>
     
     <#if messageAlreadyOpen??>
-        <#assign errorMessage = "Logins are already not restricted." />
+        <#assign errorMessage = "${i18n().logins_not_already_restricted}" />
     </#if>
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
             <p>${errorMessage}</p>
         </section>
     </#if>
 
     <#if messageRestricting??>
-        <#assign successMessage = "Logins are now restricted." />
+        <#assign successMessage = "${i18n().logins_restricted}" />
     </#if>
     
     <#if messageOpening??>
-        <#assign successMessage = "Logins are no longer restricted." />
+        <#assign successMessage = "${i18n().logins_not_restricted}" />
     </#if>
 
     <#if successMessage?has_content>
@@ -36,9 +36,9 @@
 <section id="restrict-login" role="region">
     <#if restricted == true>
         <h4>Logins are restricted</h4>
-        <p><a href="${openUrl}" title="Remove Restrictions">Remove Restrictions</a></p>
+        <p><a href="${openUrl}" title="${i18n().remove_restrictions}">${i18n().remove_restrictions}</a></p>
     <#else>
         <h4>Logins are open to all</h4>
-        <p><a href="${restrictUrl}" title="Restrict Logins">Restrict Logins</a></p>
+        <p><a href="${restrictUrl}" title="${i18n().Restrict Logins}">${i18n().Restrict Logins}</a></p>
     </#if>
 </section>
diff --git a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
index 6a7c981f4..5a4b06714 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
@@ -7,24 +7,24 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
 <h2>Authorization Info</h2>
 
 <section id="show-auth" role="region">
-    <h4>Current user</h4>
+    <h4>${i18n().current_user}</h4>
     <table summary="Information about the current user">
     <#if currentUser?has_content>
             <tr><th>URI:</th><td>${currentUser.uri}</td></tr>
-            <tr><th>First name:</th><td>${currentUser.firstName}</td></tr>
-            <tr><th>Last name:</th><td>${currentUser.lastName}</td></tr>
-            <tr><th>Email:</th><td>${currentUser.emailAddress}</td></tr>
-            <tr><th>External Auth ID:</th><td>${currentUser.externalAuthId}</td></tr>
-            <tr><th>Login count:</th><td>${currentUser.loginCount}</td></tr>
+            <tr><th>${i18n().first_name}:</th><td>${currentUser.firstName}</td></tr>
+            <tr><th>${i18n().last_name}:</th><td>${currentUser.lastName}</td></tr>
+            <tr><th>${i18n().email_address}:</th><td>${currentUser.emailAddress}</td></tr>
+            <tr><th>${i18n().external_auth_id}:</th><td>${currentUser.externalAuthId}</td></tr>
+            <tr><th>${i18n().login_count}:</th><td>${currentUser.loginCount}</td></tr>
             <#list currentUser.permissionSetUris as role>
-                <tr><th>Role:</th><td>${role}</td></tr>
+                <tr><th>${i18n().user_role}:</th><td>${role}</td></tr>
             </#list>
     <#else>
-        <tr><th>Not logged in</th></tr>
+        <tr><th>${i18n().not_logged_in}</th></tr>
     </#if>
     </table>
    
-    <h4>Identifiers:</h4>
+    <h4>${i18n().identifiers}:</h4>
     <table summary="Identifiers">
         <#list identifiers as identifier>
             <tr>
@@ -34,11 +34,11 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
     </table>
 
     <h4>
-        AssociatedIndividuals: 
+        ${i18n().associated_individuals}: 
         <#if matchingProperty??>
-            (match by ${matchingProperty})
+            (${i18n().match_by(matchingProperty)})
         <#else>
-            (matching property is not defined)
+            (${i18n().matching_prop_not_defined})
         </#if>
     </h4>
     <table summary="Associated Individuals">
@@ -47,18 +47,18 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
                 <tr>
                     <td>${associatedIndividual.uri}</td>
                     <#if associatedIndividual.editable>
-                        <td>May edit</td>
+                        <td>${i18n().may_edit}</td>
                     <#else>
-                        <td>May not edit</td>
+                        <td>${i18n().may_not_edit}</td>
                     </#if>
                 </tr>
             </#list>
         <#else>
-            <tr><td>none</td></tr>
+            <tr><td>${i18n().none}</td></tr>
         </#if>
     </table>
 
-    <h4>Identifier factories:</h4>
+    <h4>${i18n().identifier_factories}:</h4>
     <table summary="Active Identifier Factories">
         <#list factories as factory>
             <tr>
@@ -67,7 +67,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         </#list>
     </table>
 
-    <h4>Policies:</h4>
+    <h4>${i18n().policies}:</h4>
     <table summary="Policies" width="100%">
         <#list policies as policy>
             <tr>
@@ -76,7 +76,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" /
         </#list>
     </table>
 
-    <h4>Authenticator:</h4>
+    <h4>${i18n().authenticator}:</h4>
     <table summary="Authenticator" width="100%">
         <tr>
             <td>${authenticator}</td>
diff --git a/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl b/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
index 6b2b9a127..d9b5d8e38 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
@@ -17,15 +17,15 @@ table.threadInfo th {
 </style>
 
 
-<h2>Background Threads</h2>
+<h2>${i18n().background_threads}</h2>
 
 <section id="show-threads" role="region">
     <#list threads as threadInfo>
         <table class="threadInfo ${threadInfo.workLevel}" summary="Thread ${threadInfo.name}">
-            <tr><th>Name</th><td>${threadInfo.name}</td></tr>
-            <tr><th>WorkLevel</th><td>${threadInfo.workLevel}</td></tr>
-            <tr><th>Since</th><td>${threadInfo.since}</td></tr>
-            <tr><th>Flags</th><td>${threadInfo.flags}</td></tr>
+            <tr><th>${i18n().name}</th><td>${threadInfo.name}</td></tr>
+            <tr><th>${i18n().work_level}</th><td>${threadInfo.workLevel}</td></tr>
+            <tr><th>${i18n().since}</th><td>${threadInfo.since}</td></tr>
+            <tr><th>${i18n().flags}</th><td>${threadInfo.flags}</td></tr>
         </table>
     </#list>
 </section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/admin/searchIndex.ftl b/webapp/web/templates/freemarker/body/admin/searchIndex.ftl
index ab5ee849e..6486e17c8 100644
--- a/webapp/web/templates/freemarker/body/admin/searchIndex.ftl
+++ b/webapp/web/templates/freemarker/body/admin/searchIndex.ftl
@@ -4,40 +4,40 @@
     Template for the page that controls the updating or rebuilding of the Search Index. 
 -->
 
-<h2>Search Index Status</h2>
+<h2>${i18n().search_index_status}</h2>
 
 <#if !indexIsConnected>
     <!-- Can't contact the Solr server. Indexing would be impossible. Show an error message. -->
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
-        <p>The search index is not connected.</p>
-        <p><tt>SolrServer.ping()</tt> failed.
-        <p>Check startup status page and/or Tomcat logs for more information.</p>
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="Error alert icon" />
+        <p>${i18n().search_index_not_connected}</p>
+        <p><tt>SolrServer.ping()</tt> ${i18n().failed}.
+        <p>${i18n().check_startup_status}</p>
     </section>
     
 <#elseif worklevel == "IDLE">
     <!-- Solr indexer is idle. Show the button that rebuilds the index. -->
-    <h3>The search indexer is idle.</h3>
+    <h3>${i18n().search_indexer_idle}</h3>
     <#if hasPreviousBuild??>
-        <p>The most recent update was at ${since?string("hh:mm:ss a, MMMM dd, yyyy")}</p>
+        <p>${i18n().most_recent_update} ${since?string("hh:mm:ss a, MMMM dd, yyyy")}</p>
     </#if>
     
     <form action="${actionUrl}" method="POST">
         <p>
-            <input class="submit" type="submit" name="rebuild" value="Rebuild" role="button" />
-            Reset the search index and re-populate it.
+            <input class="submit" type="submit" name="rebuild" value="${i18n().rebuild_button}" role="button" />
+            ${i18n().reset_search_index}
         </p>
     </form>
     
 <#elseif totalToDo == 0>
     <!-- Solr indexer is preparing the list of records. Show elapsed time since request. -->
-    <h3>Preparing to rebuild the search index. </h3>
-    <p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}</p>
+    <h3>${i18n().preparing_to_rebuild_index}</h3>
+    <p>${i18n().since_elapsed_time(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed)}</p>
     
 <#else>
     <!-- Solr indexer is re-building the index. Show the progress. -->
-    <h3>${currentTask} the search index.</h3>
-    <p>since ${since?string("hh:mm:ss a, MMMM dd, yyyy")}, elapsed time ${elapsed}, estimated total time ${expected}</p>
-    <p>Completed ${completedCount} out of ${totalToDo} index records.</p>
+    <h3>${i18n().current_task(currentTask)}</h3>
+    <p>${i18n().since_elapsed_time_est_total(since?string("hh:mm:ss a, MMMM dd, yyyy"),elapsed,expected)}</p>
+    <p>${i18n().index_recs_completed(completedCount,totalToDo)}</p>
     
 </#if>
diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
index f55cb53fc..1d8288d33 100644
--- a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
+++ b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
@@ -35,9 +35,9 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')}
 
 <#if status.errorItems?has_content>
-    <h2>Fatal error</h2>
+    <h2>${i18n().fatal_error}</h2>
     
-    <p>${applicationName} detected a fatal error during startup.</p>
+    <p>${i18n().fatal_error_detected(applicationName)}</p>
    
     <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
     <#list status.errorItems as item>
@@ -47,9 +47,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
 </#if>
 
 <#if status.warningItems?has_content>
-    <h2>Warning</h2>
+    <h2>${i18n().warning}</h2>
     
-    <p>${applicationName} issued warnings during startup.</p>
+    <p>${i18n().warning_issued(applicationName)}</p>
     
     <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
       <@statusItem item=item />
@@ -57,9 +57,9 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.c
     </ul>
 </#if>
 
-<h2>Startup trace</h2>
+<h2>${i18n().startup_trace}</h2>
 
-<p>The full list of startup events and messages.</p>
+<p>${i18n().full_list_startup}</p>
 
 <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
       <#list status.statusItems as item>
diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
index ff1351e5a..ce638c1fb 100644
--- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
+++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
@@ -1,10 +1,10 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- 
-    Template for the raw page that displays the StartupStatus if there 
+<#--
+    Template for the raw page that displays the StartupStatus if there
     are warnings or errors.
     
-    "raw" because this template works outside of the usual framework, in 
+    "raw" because this template works outside of the usual framework, in
     case the Freemarker context didn't initialize properly.
     
     This file can't even include a reference to an external CSS file, in case
@@ -63,7 +63,7 @@
                background-color: #FFDDDD;
            }
            #startup-trace li.warning{
-               background-color: #FFFFDD; 
+               background-color: #FFFFDD;
            }
            #startup-trace li.info {
                background-color: #DDFFDD;
@@ -72,7 +72,7 @@
                background-color: #F3F3F0;
            }
            
-        </style> 
+        </style>
     </head>
 
     <body>
@@ -101,7 +101,7 @@
             <#-- If there were no fatal errors, let them go forward from here. -->
             <#if showLink>
                 <p><a href="${url}" title="continue">Continue</a></p>
-    	    </#if>
+     </#if>
             
         </#if>
 
@@ -115,4 +115,4 @@
               </#list>
         </ul>
     </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/classGroups.ftl b/webapp/web/templates/freemarker/body/classGroups.ftl
index ab5307be4..5703c6b30 100644
--- a/webapp/web/templates/freemarker/body/classGroups.ftl
+++ b/webapp/web/templates/freemarker/body/classGroups.ftl
@@ -19,14 +19,14 @@
                             <#list classGroup.classes as class> 
                                 <#-- Only render populated classes -->
                                 <#if (class.individualCount > 0)>
-                                    <li role="listitem"><a href="${class.url}" title="class name">${class.name}</a> (${class.individualCount})</li>
+                                    <li role="listitem"><a href="${class.url}" title="${i18n().class_name}">${class.name}</a> (${class.individualCount})</li>
                                 <#assign classCount = classCount + 1 >
                                 </#if>
                                 <#if (classCount > 34) && !splitGroup >
                                    <#assign splitGroup = true >
                                    </ul></div>
                                    <div class="class-group">
-                                       <h2>${classGroup.displayName} (cont'd)</h2>
+                                       <h2>${classGroup.displayName} (${i18n().continued})</h2>
                                           <ul role="list">
                                 </#if>
                             </#list>
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl
index 981b57ca0..1c55cbdad 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-backup.ftl
@@ -6,9 +6,9 @@
 
 <#if spamReason??>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         
-        <p>REJECTED - SPAM</p>
+        <p>${i18n().rejected_spam}</p>
         <p>${spamReason}</p>
     </section>
 </#if>
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-confirmation.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
index ce47b43b6..49cb40912 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-confirmation.ftl
@@ -2,7 +2,7 @@
 
 <#-- Contact form submission confirmation page -->
 
-<h2>Thank you for your feedback</h2>
+<h2>${i18n().feedback_thanks_heading}</h2>
 
-<p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
-<p>Return to the <a href="${urls.home}">home page</a>.</p>
\ No newline at end of file
+<p>${i18n().feedback_thanks_text}</p>
+<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a>.</p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl
index 06e04779e..5740cb0e6 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-email.ftl
@@ -12,17 +12,17 @@
     <body>
         <h3>${subject}</h3>
         
-        <p><strong>From:</strong> ${name}</p>
+        <p><strong>${i18n().from_capitalized}:</strong> ${name}</p>
 
-        <p><strong>Email address:</strong> ${emailAddress}</p>
+        <p><strong>${i18n().email_address}:</strong> ${emailAddress}</p>
             
         <p>
-            <strong>IP address:</strong> ${ip}<br />
+            <strong>${i18n().ip_address}:</strong> ${ip}<br />
             <#if referrer??>
-                <em>Likely viewing page: ${referrer}</em>
+                <em>${i18n().viewing_page}: ${referrer}</em>
             </#if>
         </p>  
         
-        <p><strong>Comments:</strong> ${comments}</p>
+        <p><strong>${i18n().comments}:</strong> ${comments}</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
index 93bfbd4cb..7ca324cca 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
@@ -10,4 +10,6 @@
     </section>
 </#if>
 
-<p class="contactUsReturnHome">Return to the <a href="${urls.home}" title="home page">home page</a>.</p> 
\ No newline at end of file
+<p class="contactUsReturnHome">${i18n().return_to_the} 
+    <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a>.
+</p> 
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
index 7c36a3676..f44cf31f3 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-form.ftl
@@ -11,9 +11,7 @@
         </section>
     </#if>
 
-    <p>Thank you for your interest in ${siteName}. 
-        Please submit this form with questions, comments, or feedback about the content of this site.
-    </p>
+    <p>${i18n().interest_thanks(siteName)}</p>
         
     <form name="contact_form" id="contact_form" class="customForm" action="${formAction!}" method="post" onSubmit="return ValidateForm('contact_form');" role="contact form">
         <input type="hidden" name="RequiredFields" value="webusername,webuseremail,s34gfd88p9x1" />
@@ -22,25 +20,25 @@
         <input type="hidden" name="EmailFieldsNames" value="emailaddress" />
         <input type="hidden" name="DeliveryType" value="contact" />
     
-        <label for="webusername">Full name <span class="requiredHint"> *</span></label>
+        <label for="webusername">${i18n().full_name} <span class="requiredHint"> *</span></label>
         <input type="text" name="webusername" value="${webusername!}"/>
         
-        <label for="webuseremail">Email address <span class="requiredHint"> *</span></label>
+        <label for="webuseremail">${i18n().email_address} <span class="requiredHint"> *</span></label>
         <input type="text" name="webuseremail"  value="${webuseremail!}"/>
 
-        <label>Comments, questions, or suggestions <span class="requiredHint"> *</span></label>
+        <label>${i18n().comments_questions} <span class="requiredHint"> *</span></label>
         <textarea name="s34gfd88p9x1" rows="10" cols="90">${comments!}</textarea>
         
        
-    	<p><label class="realpersonLabel">Please enter the letters displayed below into the security field:</label>
+    	<p><label class="realpersonLabel">${i18n().enter_in_security_field}:</label>
 
     		<input type="text" id="defaultReal" name="defaultReal"></p>
         
         <div class="buttons">
-            <br /><input id="submit" type="submit" value="Send Mail" />
+            <br /><input id="submit" type="submit" value="${i18n().send_mail}" />
         </div>
         
-        <p class="requiredHint">* required fields</p>
+        <p class="requiredHint">* ${i18n().required_fields}</p>
     </form>    
 </section>
 
diff --git a/webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl b/webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl
index ab5fa51a7..40afdbf84 100644
--- a/webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl
+++ b/webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl
@@ -5,7 +5,7 @@
     
     <#if errorMessage??>
         <div id="errorAlert">
-            <img src="../images/iconAlert.png" alert="Error alert icon" height="31" width="32">
+            <img src="../images/iconAlert.png" alt="Error alert icon" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>
diff --git a/webapp/web/templates/freemarker/body/error/error-display.ftl b/webapp/web/templates/freemarker/body/error/error-display.ftl
index bd1936097..a878bc098 100644
--- a/webapp/web/templates/freemarker/body/error/error-display.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-display.ftl
@@ -3,27 +3,27 @@
 <#-- Template for general system error. -->
 
 <p>
-    There was an error in the system. 
+    ${i18n().we_have_an_error} 
     <#if sentEmail>
-        This error has been reported to the site administrator. 
+        ${i18n().error_was_reported} 
     </#if>
 </p>  
     
 <#if adminErrorData??> <#-- view for site administrators -->
    <#if adminErrorData.errorMessage?has_content>
-        <p><strong>Error message:</strong> ${adminErrorData.errorMessage?html}</p>
+        <p><strong>${i18n().error_message}:</strong> ${adminErrorData.errorMessage?html}</p>
     </#if>
     <#if adminErrorData.stackTrace?has_content>
         <p>
-            <strong>Stack trace</strong> (full trace available in the vivo log): ${adminErrorData.stackTrace?html}
+            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): ${adminErrorData.stackTrace?html}
         </p>
                    
         <#if adminErrorData.cause?has_content>
-            <p><strong>Caused by:</strong> ${adminErrorData.cause?html}</p>            
+            <p><strong>${i18n().caused_by}:</strong> ${adminErrorData.cause?html}</p>            
         </#if>
     </#if>  
 
 <#elseif ! errorOnHomePage> <#-- view for other users -->
-    <p>Return to the <a href="${urls.home}" title="home page">home page</a></p> 
+    <p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p> 
 </#if>
 
diff --git a/webapp/web/templates/freemarker/body/error/error-email.ftl b/webapp/web/templates/freemarker/body/error/error-email.ftl
index 90963b60f..9f5b360c6 100644
--- a/webapp/web/templates/freemarker/body/error/error-email.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-email.ftl
@@ -2,7 +2,7 @@
 
 <#-- Template for email message sent to site administrator when an error occurs on the site. -->
 
-<#assign subject = "An error occurred on the VIVO site" />
+<#assign subject = "${i18n().error_occurred}" />
 
 <#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
 
@@ -13,26 +13,26 @@
     </head>
     <body>
         <p>
-            An error occurred on your VIVO site at ${datetime!}.
+            ${i18n().error_occurred_at(datetime!)}
         </p>
         
         <p>
-            <strong>Requested url:</strong> ${requestedUrl!}
+            <strong>${i18n().requested_url}:</strong> ${requestedUrl!}
         </p>
         
         <p>
         <#if errorMessage?has_content>
-            <strong>Error message:</strong> ${errorMessage!}
+            <strong>${i18n().error_message}:</strong> ${errorMessage!}
         </#if>
         </p>
         
         <p>
-            <strong>Stack trace</strong> (full trace available in the vivo log): 
+            <strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): 
             <pre>${stackTrace!}</pre>
         </p>
         
         <#if cause?has_content>
-            <p><strong>Caused by:</strong> 
+            <p><strong>${i18n().caused_by}:</strong> 
                 <pre>${cause!}</pre>
             </p>
         </#if>
@@ -42,19 +42,19 @@
 </#assign>
 
 <#assign text>
-An error occurred on your VIVO site at ${datetime!}.
+${i18n().error_occurred_at(datetime!)}
 
-Requested url: ${requestedUrl!}
+${i18n().requested_url}: ${requestedUrl!}
 
 <#if errorMessage?has_content>
-    Error message: ${errorMessage!}
+    ${i18n().error_message}: ${errorMessage!}
 </#if>
 
-Stack trace (full trace available in the vivo log): 
+${i18n().stack_trace} (${i18n().trace_available}): 
 ${stackTrace!}
 
 <#if cause?has_content>
-Caused by: 
+${i18n().caused_by}: 
 ${cause!}
 </#if>       
 </#assign>
diff --git a/webapp/web/templates/freemarker/body/error/error-standard.ftl b/webapp/web/templates/freemarker/body/error/error-standard.ftl
index 1eedaf780..690f5d041 100644
--- a/webapp/web/templates/freemarker/body/error/error-standard.ftl
+++ b/webapp/web/templates/freemarker/body/error/error-standard.ftl
@@ -2,6 +2,6 @@
 
 <#-- Template for general system error. -->
 
-<p>There was an error in the system.</p>
+<p>${i18n().we_have_an_error}.</p>
 
-<p>Return to the <a href="${urls.home}" title="home page">home page</a>.</p> 
\ No newline at end of file
+<p>${i18n().return_to_the} <a href="${urls.home}" title="${i18n().home_page}">${i18n().home_page}</a></p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individual/individual-help.ftl b/webapp/web/templates/freemarker/body/individual/individual-help.ftl
index 6929787c8..09efeeacf 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-help.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-help.ftl
@@ -2,6 +2,6 @@
 
 <#-- Template for help on individual page -->
 
-<h2>Individual not found:</h2>
+<h2>${i18n().individual_not_found}</h2>
 
-<p>id is the id of the entity to query for. netid also works.</p>
\ No newline at end of file
+<p>${i18n().entity_to_query_for}</p>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
index 9819b280a..222d0d6fd 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
@@ -13,7 +13,7 @@
         var menuItemData = [];
     </script>
     
-    <h3>Menu Ordering</h3>
+    <h3>${i18n().menu_ordering}</h3>
     
     <#-- List the menu items -->
     <ul class="menuItems">
@@ -34,7 +34,7 @@
         
         </form>
             <br />
-            <p class="note">Refresh page after reordering menu items</p>
+            <p class="note">${i18n().refresh_page_after_reordering}</p>
         </#if>
     </#if>
     
@@ -55,5 +55,5 @@
     
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
 <#else>
-    <p id="error-alert">There was an error in the system. The display:hasElement property could not be retrieved.</p>
+    <p id="error-alert">${i18n().display_has_element_error}</p>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
index 12bc8f92c..33b43769d 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
@@ -28,7 +28,7 @@
         <header>
             <#if relatedSubject??>
                 <h2>${relatedSubject.relatingPredicateDomainPublic} for ${relatedSubject.name}</h2>
-                <p><a href="${relatedSubject.url}" title="return to subject">&larr; return to ${relatedSubject.name}</a></p>                
+                <p><a href="${relatedSubject.url}" title="${i18n().return_to(relatedSubject.name)}">&larr; ${i18n().return_to(relatedSubject.name)}</a></p>                
             <#else>                
                 <h1 class="fn">
                     <#-- Label -->
diff --git a/webapp/web/templates/freemarker/body/individual/manageLabelsForIndividual.ftl b/webapp/web/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
index fcdcb34f8..1a5693459 100644
--- a/webapp/web/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
+++ b/webapp/web/templates/freemarker/body/individual/manageLabelsForIndividual.ftl
@@ -7,11 +7,9 @@
 <#if subjectName?? >
 <h2>Manage Labels for ${subjectName}</h2>
 <#else>
-<h2>Manage Labels</h2>
+<h2>${i18n().manage_labels}</h2>
 </#if>
-<p id="mngLabelsText">
-Multiple labels exist for this profile but there should only be one. Select the label you want displayed on the profile page, and the others will be deleted. 
-</p>
+<p id="mngLabelsText">${i18n().manage_labels_intro}</p>
 
     <section id="rdfsLabels" role="container">
         <ul>
@@ -43,11 +41,11 @@ Multiple labels exist for this profile but there should only be one. Select the
 
         <br />   
         <p>       
-            <input type="button" class="submit" id="submit" value="Save" role="button" role="input" />
+            <input type="button" class="submit" id="submit" value="${i18n().save_button}" role="button" role="input" />
             <span class="or"> or </span>
-            <a href="${urls.referringPage}" class="cancel" title="cancel" >Cancel</a>
+            <a href="${urls.referringPage}" class="cancel" title="${i18n().cancel_title}" >${i18n().cancel_link}</a>
             <span id="indicator" class="indicator hidden">
-                <img class="indicator" src="${urls.base}/images/indicatorWhite.gif" />&nbsp;Your selection is being processed.
+                <img class="indicator" src="${urls.base}/images/indicatorWhite.gif" alt="${i18n().processing_icon}"/>&nbsp;${i18n().selection_in_process}
             </span>
         </p>
     </section>
diff --git a/webapp/web/templates/freemarker/body/individualList-checkForData.ftl b/webapp/web/templates/freemarker/body/individualList-checkForData.ftl
index 3c6fa2d0e..d87214cf8 100644
--- a/webapp/web/templates/freemarker/body/individualList-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/individualList-checkForData.ftl
@@ -10,19 +10,19 @@
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
-                <h4>Expecting content?</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <h4>${i18n().expecting_content}</h4>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no ${title} content in the system</h3>
+    <h3>${i18n().no_content_in_system(title)}</h3>
     
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
 </#assign>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl
index c03afc558..4746a0a7f 100644
--- a/webapp/web/templates/freemarker/body/individualList.ftl
+++ b/webapp/web/templates/freemarker/body/individualList.ftl
@@ -11,7 +11,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
 <section class="individualList">
     <h2>${title} 
         <#if rdfUrl?has_content>
-            <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="View the ${title} list in RDF format">RDF</a></span>
+            <span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
         </#if>
     </h2>
     <#if subtitle?has_content>
@@ -24,7 +24,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
         <#else>
             <#assign pagination>
                 <#if (pages?has_content && pages?size > 1)>
-                    pages:
+                    ${i18n().pages}:
                     <ul class="pagination">
                         <#list pages as page>
                             <#if page.selected>
diff --git a/webapp/web/templates/freemarker/body/login/adminLogin.ftl b/webapp/web/templates/freemarker/body/login/adminLogin.ftl
index d8d856dea..d09934eb7 100644
--- a/webapp/web/templates/freemarker/body/login/adminLogin.ftl
+++ b/webapp/web/templates/freemarker/body/login/adminLogin.ftl
@@ -3,69 +3,69 @@
 <#-- Template for login using internal vitro account (even when external auth is enabled). Accessible at /admin/login -->
 
 <section id="internalLogin" role="region">
-    <h2>Internal Login</h2>
+    <h2>${i18n().internal_login}</h2>
 
     <#if errorNoEmail??>
-        <#assign errorMessage = "No email supplied." />
+        <#assign errorMessage = "${i18n().no_email_supplied}" />
     </#if>
     
     <#if errorNoPassword??>
-        <#assign errorMessage = "No password supplied." />
+        <#assign errorMessage = "${i18n().no_password_supplied}" />
     </#if>
     
     <#if errorLoginDisabled??>
-        <#assign errorMessage = "User logins are temporarily disabled while the system is being maintained." />
+        <#assign errorMessage = "${i18n().logins_temporarily_disabled}" />
     </#if>
     
     <#if errorLoginFailed??>
-        <#assign errorMessage = "Email or Password was incorrect." />
+        <#assign errorMessage = "${i18n().incorrect_email_password}" />
     </#if>
     
     <#if errorNewPasswordWrongLength??>
-        <#assign errorMessage = "Password must be between 6 and 12 characters." />
+        <#assign errorMessage = "${i18n().password_length}" />
     </#if>
     
     <#if errorNewPasswordsDontMatch??>
-        <#assign errorMessage = "Passwords do not match." />
+        <#assign errorMessage = "${i18n().password_mismatch}" />
     </#if>
     
     <#if errorNewPasswordMatchesOld??>
-        <#assign errorMessage = "Your new password must be different from your existing password." />
+        <#assign errorMessage = "${i18n().new_pwd_matches_existing}" />
     </#if>
     
     <#if errorMessage?has_content>
         <section id="error-alert" role="alert">
-            <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
+            <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
             <p>${errorMessage}</p>
         </section>
     </#if>
     
     <#if !newPasswordRequired??>
-        <p>Enter the email address and password for your internal Vitro account.</p>
+        <p>${i18n().enter_email_password}</p>
     <#else>
-        <p>You must change your password to log in.</p>
+        <p>${i18n().change_password}</p>
     </#if>
 
 	<form method="post" action="${controllerUrl}">
         <#if newPasswordRequired??>
-            <label for="newPassword">New Password</label>
+            <label for="newPassword">${i18n().new_password}</label>
             <input name="newPassword" id="newPassword" class="text-field" type="password" required autofocus />
             
-            <p class="password-note">Minimum of 6 characters in length.</p>
+            <p class="password-note">${i18n().Minimum of 6 characters in length.</p>
             
-            <label for="confirmPassword">Confirm Password</label>
+            <label for="confirmPassword">${i18n().confirm_password}</label>
             <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
             
             <input id="email" name="email" type="hidden" value="${email!}" />
             <input id="password" name="password" type="hidden" value="${password!}" />
         <#else>
-            <label for="email">Email</label>
+            <label for="email">${i18n().email_capitalized}</label>
             <input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
 
-        	<label for="password">Password</label>
+        	<label for="password">${i18n().password_capitalized}</label>
             <input id="password" name="password" class="text-field" type="password" required />
         </#if>
 
-		<p class="submit"><input name="loginForm" type="submit" class="green button" value="Log in"/></p>
+		<p class="submit"><input name="loginForm" type="submit" class="green button" value="${i18n().login_button}"/></p>
 	</form>
 </section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
index c5c30d24c..f1576b906 100644
--- a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
+++ b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
@@ -3,17 +3,17 @@
 <#-- Template for the Fake External Authentication page. -->
 
 <section role="region">
-    <h2>Fake External Authentication</h2>
+    <h2>${i18n().fake_external_auth}</h2>
     
     <p>
-      Enter the userID that you want to sign in as, or click Cancel.
+      ${i18n().enter_id_to_login}
     </p>
 
 		<form action="${controllerUrl}">
-			Username:
+			${i18n().username}:
 			<input type="text" name="username" />
-			<input type="submit" value="submit" /> 
-			<input type="submit" name="cancel" value="cancel" /> 
+			<input type="submit" value="${i18n().submit_button}" /> 
+			<input type="submit" name="cancel" value="${i18n().cancel_link}" /> 
 		</form>
     <br/>
 </section>
diff --git a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index efe74bd6b..fc0eb44ea 100644
--- a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -2,36 +2,36 @@
 
 <#-- Template for displaying list of user accounts -->
 
-<h3>Manage profile editing</h3>
+<h3>${i18n().manage_profile_editing}</h3>
 
 <#if message??>
     <section class="account-feedback" role="region">
         <#if message.success?? > 
-            <p>The operation was successful.</p>
+            <p>${i18n().operation_successful}</p>
         </#if>
     
         <#if message.failure?? >
-            <p> The operation was unsuccessful. Full details can be found in the system log.</p>
+            <p>${i18n().operation_unsuccessful}</p>
         </#if>
     </section>
 </#if>
 
 <section id="error-alert" role="alert" class="hidden">
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p></p>
 </section>
 
 <section class="proxy-profile">
-    <h4>Relate profile editors and profiles <img src="${urls.images}/iconInfo.png" alt="info icon" title="The editors you select on the left hand side will have the ability to edit the VIVO profiles you select on the right hand side. You can select multiple editors and multiple profiles, but you must select a minimum of 1 each." /></h4>
+    <h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title}" /></h4>
     
     <form id="add-relation" action="${formUrls.create}" method="POST">
         <fieldset class="proxy">
-            <legend>Select editors</legend>
+            <legend>${i18n().select_editors}</legend>
             
             <section name="proxyProxiesPanel" role="section">
-                <label for="selectProfileEditors">Select editors</label>
-                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" /></span>
-                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+                <label for="selectProfileEditors">${i18n().select_editors}</label>
+                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
+                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
     
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -48,7 +48,7 @@
                             <p class="proxy-info">
                                 %label% | <span class="class-label">%classLabel%</span>
                                 <br />
-                                <a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                                 <input type="hidden" name="proxyUri" value="%uri%" >
                             </p>
                         </li>
@@ -58,13 +58,13 @@
         </fieldset>
     
         <fieldset class="profile">
-          <legend>Select profiles</legend>  
+          <legend>${i18n().select_profiles}</legend>  
       
           <section name="proxyProfilesPanel" role="region">
-              <label for="selectProfiles">Select profiles</label>
-              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif" /></span>
+              <label for="selectProfiles">${i18n().select_profiles}</label>
+              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif"  alt="${i18n().processing_indicator}"/></span>
             
-              <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+              <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
 
                 <#-- Magic div thst holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -79,7 +79,7 @@
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
                             
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
-                                <br /><a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
     
                             <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
@@ -89,19 +89,19 @@
             </section>
         </fieldset>
 
-        <input class="submit pos-submit" type="submit" name="createRelationship" value="Save"  role="button" />
+        <input class="submit pos-submit" type="submit" name="createRelationship" value="${i18n().save_button}"  role="button" />
     </form>
 </section>
 
 
-<h4 class="profile-editors">Profile editors</h4>
+<h4 class="profile-editors">${i18n().profile_editors}</h4>
 
 <section id="search-proxy" role="region">
     <form action="${formUrls.list}" method="POST">
         <input type="text" name="searchTerm" role="input" />
-        <input class="submit" type="submit" name="searchByProxy" value="Search" role="button" /> 
+        <input class="submit" type="submit" name="searchByProxy" value="${i18n().search_button}" role="button" /> 
             <#if page.previous??>
-               | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="previous">Previous</a>
+               | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="${i18n().previous}">${i18n().previous}</a>
             </#if>
             
             <#if page.last != 0>
@@ -109,11 +109,11 @@
             </#if>
             
             <#if page.next??>
-                <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}" title="next">Next</a>
+                <a href="${formUrls.list}?pageIndex=${page.next}&searchTerm=${searchTerm}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a>
             </#if>
 
             <#if searchTerm?has_content>
-                <p>Search results for "<span class="blue">${searchTerm}</span>" | <a href="${formUrls.list}" title="view all profile editors">View all profile editors</a></p>
+                <p>${i18n().search_results_for} '<span class="blue">${searchTerm}</span>' | <a href="${formUrls.list}" title="${i18n().view_profile_editors}">${i18n().view_profile_editors}</a></p>
             </#if>
     </form>
 </section>
@@ -129,22 +129,22 @@
                 <p class="proxyInfoElement proxy-info">
                     ${p.label} | <span class="class-label">${p.classLabel}</span>
                     <br>
-                    <a class="remove-proxyUri" href="${formUrls.edit}?proxyUri=${p.uri}&deleteProxy=Delete proxy" title="delete profile editor">Delete profile editor</a>
+                    <a class="remove-proxyUri" href="${formUrls.edit}?proxyUri=${p.uri}&deleteProxy=Delete proxy" title="${i18n().delete_profile_editor}">${i18n().delete_profile_editor}</a>
                     <input type="hidden" value="${p.uri}" name="proxyUri">
                 </p>
             </div>       
         </fieldset>  
         
         <fieldset class="profile">
-            <legend>Add profile</legend>
+            <legend>${i18n().add_profile}</legend>
             
             <section name="proxyProfilesPanel" role="region">
-                <label for="addProfile">Add profile</label>
-                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="Select an existing last name" role="input" /><span><img class="loading-addProfile hidden" src="${urls.images}/indicatorWhite.gif" /></span>
+                <label for="addProfile">${i18n().add_profile}</label>
+                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-addProfile hidden"  alt="${i18n().processing_indicator}" src="${urls.images}/indicatorWhite.gif" /></span>
                 
-                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='type more characters' noMatchText='no match'>&nbsp;</span></p>
+                <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
                 <p name="excludeUri" style="display: none">${r.proxyInfos[0].profileUri}<p>
-                <p class="selected-editors">Selected profiles:</p>
+                <p class="selected-editors">${i18n().selected_profiles}:</p>
     
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
                 <ul name="proxyData" role="navigation">
@@ -168,7 +168,7 @@
                             <img class="photo-profile" width="60" alt="%label%" src="%imageUrl%">
                              
                             <p class="proxy-info-profile">%label% | <span class="class-label">%classLabel%</span>
-                                <br /><a class='remove-proxy' href="." templatePart="remove" title="remove selection">Remove selection</a>
+                                <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
                         </li>
                         
@@ -177,7 +177,7 @@
                 </ul>
             </section>
             
-            <input class="submit" type="submit" name="modifyProfileList" value="Save changes to profiles" role="button" />
+            <input class="submit" type="submit" name="modifyProfileList" value="${i18n().save_profile_changes}" role="button" />
         </fieldset> 
     </form>
 </section>
diff --git a/webapp/web/templates/freemarker/body/menuN3Edit.ftl b/webapp/web/templates/freemarker/body/menuN3Edit.ftl
index f9f3ea212..b6c671054 100644
--- a/webapp/web/templates/freemarker/body/menuN3Edit.ftl
+++ b/webapp/web/templates/freemarker/body/menuN3Edit.ftl
@@ -1,11 +1,11 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <div id="navigationManagement">
-    <h2>Menu Management</h2>
+    <h2>${i18n().menu_management}</h2>
     
     <#if errorMessage??>
         <div id="errorAlert">
-            <img src="../images/iconAlert.png" alert="Error alert icon" height="31" width="32">
+            <img src="../images/iconAlert.png" alt="${i18n().error_alert_icon}" height="31" width="32">
             <p>${errorMessage}</p>
         </div>
     </#if>
@@ -16,11 +16,11 @@
     
     <#if menuN3??>
         <form class="" action="${urls.currentPage}" method="post">
-            <label for="navigatioN3">Setup the primary navigation menu for your website</label>
+            <label for="navigatioN3">${i18n().setup_navigation_menu}</label>
             <textarea name="navigationN3" id="navigationN3" cols="45" rows="40" class="maxWidth">
                 ${menuN3}<#t><#-- The trim directive here is to trim leading and trailing white-space -->
             </textarea><#lt><#-- This directive trims only leading white-space -->
-            <input name="submit" id="submit" value="Save" type="submit"/> or <a href="${urls.base}${cancelUrl}" title="cancel">Cancel</a>
+            <input name="submit" id="submit" value="${i18n().save_button}" type="submit"/> or <a href="${urls.base}${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         </form>
     </#if>
 </div>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/menupage/emptyPage.ftl b/webapp/web/templates/freemarker/body/menupage/emptyPage.ftl
index 7c1940558..fa8579b12 100644
--- a/webapp/web/templates/freemarker/body/menupage/emptyPage.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/emptyPage.ftl
@@ -1,9 +1,9 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <div>
-<p>This page is not yet configured.</p> 
+<p>${i18n().page_not_configured}</p> 
 
-<p>Implement a <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1">link</a> to configure this page if the user has permission.</p>
+<p>${i18n().implement_capitalized} <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1" title="${i18n().a_link}">${i18n().a_link}</a> ${i18n().configure_page_if_permissable}</p>
 
 
 
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
index d44ca480e..ea783a5ad 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
@@ -9,7 +9,7 @@
 <#if htmlExists>
 	${.globals[variableName]}
 <#else>
-	No HTML specified.  
+	${i18n().no_html_specified}  
 </#if>
 
 
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
index e987f6d0f..9e73c2446 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
@@ -21,14 +21,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css
         <#else>
             <#assign pagination>
                 <#if (pages?has_content && pages?size > 1)>
-                    pages:
+                    ${i18n().pages}:
                     <ul class="pagination">
                         <#list pages as page>
                             <#if page.selected>
                                 <li class="selectedNavPage">${page.text}</li>
                             <#else>
                                 <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
-                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="page text">${page.text}</a></li>
+                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="${i18n().page_text}">${page.text}</a></li>
                             </#if>
                         </#list>
                     </ul>
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
index c937ba034..2d9acfce3 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
@@ -10,7 +10,7 @@
 	<#assign sparqlResults = .globals[variableName]/>
 </#if>
 
-<h3>Sparql Query Results</h3>
+<h3>${i18n().sparql_query_results}</h3>
 <#if resultsExist>
 	<#assign numberRows = sparqlResults?size/>
 	<#assign firstRow = false/>
@@ -31,7 +31,7 @@
 		</div>
 	</#list>
 <#else>
-	No results were returned.  
+	${i18n().no_results_returned} 
 </#if>
 
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/sparqlresults.css" />')}
diff --git a/webapp/web/templates/freemarker/body/menupage/page-pageList.ftl b/webapp/web/templates/freemarker/body/menupage/page-pageList.ftl
index 8553f4816..80cef6ac6 100644
--- a/webapp/web/templates/freemarker/body/menupage/page-pageList.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/page-pageList.ftl
@@ -4,29 +4,29 @@
 
 <#if pages?has_content >  
   <table>
-    <th>Title</th><th>URI</th>
+    <th>${i18n().title_capitalized}</th><th>URI</th>
     
     <#list pages as pagex>      
       <tr>                
-        <td>${(pagex.title)!'-untitled-'}</td>                  
+        <td>${(pagex.title)!i18n().untitled}</td>                  
         <#if pagex.pageUri??>
-            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1">${pagex.pageUri}</a></td>
+            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
         <#else>        
-            <td>URI for page not defined</td>
+            <td>${i18n().uri_not_defined}</td>
         </#if>                 
       </tr>    
     </#list>    
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input">
-      <input type="submit" id="submit" value="Add Page" role="button">
+      <input type="submit" id="submit" value="${i18n().add_page}" role="button">
   </form>
 
 </div> 
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/pagemanagement/page-pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/page-pageList.ftl
index 8553f4816..2884d8b09 100644
--- a/webapp/web/templates/freemarker/body/pagemanagement/page-pageList.ftl
+++ b/webapp/web/templates/freemarker/body/pagemanagement/page-pageList.ftl
@@ -4,29 +4,29 @@
 
 <#if pages?has_content >  
   <table>
-    <th>Title</th><th>URI</th>
+    <th>${i18n().title_capitalized}</th><th>URI</th>
     
     <#list pages as pagex>      
       <tr>                
         <td>${(pagex.title)!'-untitled-'}</td>                  
         <#if pagex.pageUri??>
-            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1">${pagex.pageUri}</a></td>
+            <td><a href="${urls.base}/individual?uri=${pagex.pageUri?url}&switchToDisplayModel=1" title="${i18n().page_uri}">${pagex.pageUri}</a></td>
         <#else>        
-            <td>URI for page not defined</td>
+            <td>${i18n().uri_not_defined}</td>
         </#if>                 
       </tr>    
     </#list>    
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input">
-      <input type="submit" id="submit" value="Add Page" role="button">
+      <input type="submit" id="submit" value="${i18n().Add_page}" role="button">
   </form>
 
 </div> 
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
index 02b36df1b..e2686e1f1 100644
--- a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
+++ b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
@@ -11,12 +11,12 @@
   
     <thead>
       <tr>
-        <th scope="col">Title</th>
-        <!--th scope="col">Type</th-->
+        <th scope="col">${i18n().title_capitalized}</th>
+        <!--th scope="col">${i18n().type_capitalized}</th-->
         <th scope="col">URL</th>
-        <th scope="col">Custom Template</th>
-        <th id="isMenuPage" scope="col" >Menu Page</th>
-        <th id="iconColumns" scope="col">Controls</th>
+        <th scope="col">${i18n().custom_template}</th>
+        <th id="isMenuPage" scope="col" >${i18n().menu_page}</th>
+        <th id="iconColumns" scope="col">${i18n().controls}</th>
       </tr>
     </thead>
     
@@ -28,11 +28,11 @@
             	    <#if pagex.listedPageTitle == "Home" >
             	        ${pagex.listedPageTitle!}
             	    <#else>
-            		<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">${(pagex.listedPageTitle)!'-untitled-'}</a>
+            		<a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title="${i18n().listed_page_title}">${(pagex.listedPageTitle)!i18n().untitled}</a>
             		</#if>
             		
             	<#else>
-            		No URI defined for page. 
+            		${i18n().uri_not_defined} 
             	</#if>
             </td>                  
             <!--td> {pagex.dataGetterLabel}</td-->
@@ -44,12 +44,12 @@
             </#if>
             </td>
             <td>
-                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator"><img src="${urls.images!}/individual/editIcon.gif" title="edit this page" alt="edit"></a>
+                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title=""><img src="${urls.images!}/individual/editIcon.gif" alt="${i18n().edit_page}"></a>
                 &nbsp;&nbsp;
-                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1"><img src="${urls.images!}/profile-page-icon.png" title="view the individual profile for this page" alt="profile page"></a>
+                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1" title="${i18n().view_profile_for_page}"><img src="${urls.images!}/profile-page-icon.png" alt="${i18n().view_profile_for_page}"></a>
                 &nbsp;&nbsp;
                 <#if !pagex.listedPageCannotDeletePage?has_content >
-                    <a cmd="deletePage" pageTitle=" ${pagex.listedPageTitle!}"  href="${urls.base}/deletePageController?pageURI=${pagex.listedPageUri?url}"><img src="${urls.images!}/individual/deleteIcon.gif" title="delete this page" alt="delete"></a>
+                    <a cmd="deletePage" pageTitle=" ${pagex.listedPageTitle!}"  href="${urls.base}/deletePageController?pageURI=${pagex.listedPageUri?url}" title="${i18n().delete_page}"><img src="${urls.images!}/individual/deleteIcon.gif" alt="${i18n().delete_page}"></a>
                 </#if>
             </td>
         </tr>    
@@ -60,17 +60,17 @@
   </table>
   
 <#else>
-    <p>There are no pages defined yet.</p>
+    <p>${i18n().no_pages_defined}</p>
 </#if>
   
   <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">              
       <input type="hidden" name="switchToDisplayModel" value="1">
       <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
- 	<input id="submit" value="Add Page" role="button" type="submit" >
+ 	<input id="submit" value="${i18n().add_page}" role="button" type="submit" >
   </form>
   <br />
- <p style="margin-top:10px">Use <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true">Menu Ordering</a> to set the order of menu items.</p>
+ <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
 </section>
 
 
diff --git a/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
index 2b2f75f1d..9af9a7ec5 100644
--- a/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
+++ b/webapp/web/templates/freemarker/body/partials/account/userAccounts-accountsNav.ftl
@@ -11,14 +11,14 @@
 <#macro accountsNav accountsCount=counts>
 
   <section class="accounts">
-      <input type="submit" name="delete-account" class="delete-account delete" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
+      <input type="submit" name="delete-account" class="delete-account delete" value="${i18n().delete_button}" onClick="changeAction(this.form, '${formUrls.delete}')" />
       <!-- 
           When this is clicked, the checkboxes are noticed and all other fields are ignored. 
           submit the form (submit action is formUrls.delete)
       -->
 
       <nav class="display-tools">
-          <span>| ${total} accounts | </span>  
+          <span>| ${total} ${i18n().accounts} | </span>  
 
           <select name="accountsPerPage" class="accounts-per-page">
               <#list accountsCount as count>
@@ -32,14 +32,14 @@
               -->     
           </select>
 
-          accounts per page <input type="submit" name="accounts-per-page" value="Update" /> | 
+          ${i18n().accounts_per_page} <input type="submit" name="accounts-per-page" value="${i18n().update_button}" /> | 
 
           <#if page.previous?has_content>
-              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}" title="previous">Previous</a> <!-- only present if current page is not 1.-->
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}" title="${i18n().previous}">${i18n().previous}</a> <!-- only present if current page is not 1.-->
           </#if>
               ${page.current} of ${page.last} 
           <#if page.next?has_content>
-              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}" title="next">Next</a><!-- only present if current page is not last page.-->
+              <a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a><!-- only present if current page is not last page.-->
           </#if>
       </nav>
   </section>
diff --git a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
index ceec3903c..215a438dc 100644
--- a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
+++ b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
@@ -24,7 +24,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
                 <#elseif classGroup.uri == group.uri>
                     <#assign activeGroup = selected />
                 </#if>
-                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.displayName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="${i18n().browse_capitalized} ${group.displayName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
     </#assign>
@@ -32,7 +32,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
     <#-- Display the class group browse only if we have at least one populated class group -->
     <#if firstPopulatedClassGroup??>
         <section id="browse" role="region">
-            <h4>Browse by</h4>
+            <h4>${i18n().browse_by}</h4>
             
             <ul id="browse-classgroups" role="list">
                 ${classGroupList}
@@ -77,14 +77,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
     <#else>
         <#-- Would be nice to update classgroups-checkForData.ftl with macro so it could be used here as well -->
         <#-- <#include "classgroups-checkForData.ftl"> -->
-        <h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+        <h3>${i18n().no_content_create_groups_classes}</h3>
         
         <#if user.loggedIn>
             <#if user.hasSiteAdminAccess>
-                <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+                <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
             </#if>
         <#else>
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </#if>
     </#if>
 </#macro>
diff --git a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
index 51fe77fe2..8580c11be 100644
--- a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
@@ -18,19 +18,19 @@
     <#if user.loggedIn>
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
-                <h4>Expecting content?</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <h4>${i18n().expecting_content}</h4>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+    <h3>${i18n().no_content_create_groups_classes}</h3>
     
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
 </#assign>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
index 3dcca64cc..93d58850f 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl
@@ -6,18 +6,18 @@
 
 <#if individual.showAdminPanel>
     <section id="admin">
-        <h3 id="adminPanel">Admin Panel</h3><a class="edit-individual" href="${individual.controlPanelUrl()}" title="edit this individual">Edit this individual</a>
+        <h3 id="adminPanel">${i18n().admin_panel}</h3><a class="edit-individual" href="${individual.controlPanelUrl()}" title="${i18n().edit_this_individual}">${i18n().edit_this_individual}</a>
         
         <section id = "verbose-mode">
         <#if verbosePropertySwitch?has_content>
             <#assign anchorId = "verbosePropertySwitch">
-            <#assign currentValue = verbosePropertySwitch.currentValue?string("on", "off")>
-            <#assign newValue = verbosePropertySwitch.currentValue?string("off", "on")>
-            <span>Verbose property display is <b>${currentValue}</b> | </span>
-            <a id="${anchorId}" class="verbose-toggle small" href="${verbosePropertySwitch.url}#${anchorId}" title="verbose control">Turn ${newValue}</a>
+            <#assign currentValue = verbosePropertySwitch.currentValue?string("${i18n().verbose_status_on}", "${i18n().verbose_status_off}")>
+            <#assign newValue = verbosePropertySwitch.currentValue?string("${i18n().verbose_status_off}", "${i18n().verbose_status_on}")>
+            <span>${i18n().verbose_property_status} <b>${currentValue}</b> | </span>
+            <a id="${anchorId}" class="verbose-toggle small" href="${verbosePropertySwitch.url}" title="${i18n().verbose_control}"><#if verbosePropertySwitch.currentValue!>${i18n().verbose_turn_off}<#else>${i18n().verbose_turn_on}</#if></a>
         </#if> 
         </section>
 
-        <p class="uri-link">Resource URI: <a href="${individual.uri}" target="_blank" title="resource uri">${individual.uri}</a></p>
+        <p class="uri-link">${i18n().resource_uri}: <a href="${individual.uri}" target="_blank" title="${i18n().resource_uri}">${individual.uri}</a></p>
     </section>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 48ceefded..f26210c9e 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -7,20 +7,20 @@
                 <#-- Property display name -->
                 <#if property.localName == "authorInAuthorship" && editable  >
                     <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="manage publications" <#if verbose>style="padding-top:10px"</#if> >
-                            manage publications
+                        <a id="managePubLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="${i18n().manage_publications}" <#if verbose>style="padding-top:10px"</#if> >
+                            ${i18n().manage_publications}
                         </a>
                     </h3>
                 <#elseif property.localName == "hasResearcherRole" && editable  >
                     <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="manage grants & projects" <#if verbose>style="padding-top:10px"</#if> >
-                            manage grants & projects
+                        <a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="${i18n().manage_grants_and_projects}" <#if verbose>style="padding-top:10px"</#if> >
+                            ${i18n().manage_grants_and_projects}
                         </a>
                     </h3>
                 <#elseif property.localName == "organizationForPosition" && editable  >
                     <h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> 
-                        <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="manage people" <#if verbose>style="padding-top:10px"</#if> >
-                            manage affiliated people
+                        <a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="${i18n().manage_affiliated_people}" <#if verbose>style="padding-top:10px"</#if> >
+                            ${i18n().manage_affiliated_people}
                         </a>
                     </h3>
                 <#else>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
index 8d5b013dc..0cd78b2b0 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-menus.ftl
@@ -19,7 +19,7 @@
                         	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
                             <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
                             function to capitalize all except function words. -->
-                            <li role="listitem"><a href="#${groupnameHtmlId}" title="group name">${groupname?capitalize}</a></li>
+                            <li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
                         </#if>
                     </#list>
                 </ul>
@@ -33,8 +33,8 @@
     
     <section class="property-group" role="region">
         <nav class="scroll-up" role="navigation">
-            <a href="#branding" title="scroll up">
-                <img src="${urls.images}/individual/scroll-up.gif" alt="scroll to property group menus" />
+            <a href="#branding" title="${i18n().scroll_to_menus}">
+                <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
             </a>
         </nav>
         
@@ -44,7 +44,7 @@
         	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
             <h2 id="${groupNameHtmlId}">${groupName?capitalize}</h2>
         <#else>
-            <h2 id="properties">Properties</h2>
+            <h2 id="properties">${i18n().properties_capitalized}</h2>
         </#if>
         
         <#-- List the properties in the group -->
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
index e4c4a594c..3b77322c8 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
@@ -15,8 +15,8 @@
 		<#--the function replaces spaces in the name with underscores, also called for the property group menu-->
     	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
     <#else>
-        <#assign groupName = "Properties">
-    	<#assign groupNameHtmlId = "properties" >
+        <#assign groupName = "${i18n().properties_capitalized}">
+    	<#assign groupNameHtmlId = "${i18n().properties}" >
     </#if>
         <#if tabCount = 1 >
             <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId}">${groupName?capitalize}</li>
@@ -28,7 +28,7 @@
         </#if>
 </#list>
 <#if (propertyGroups.all?size > 1) >
-    <li  class="nonSelectedGroupTab clickable" groupName="viewAll">View All</li>
+    <li  class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
     <li  class="groupTabSpacer">&nbsp;</li>
 </#if>
 </ul>
@@ -38,8 +38,8 @@
     <#assign verbose = (verbosePropertySwitch.currentValue)!false>
     <section id="${groupNameHtmlId}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
     <nav id="scroller" class="scroll-up hidden" role="navigation">
-        <a href="#branding" title="scroll up" >
-            <img src="${urls.images}/individual/scroll-up.gif" alt="scroll to property group menus" />
+        <a href="#branding" title="${i18n().scroll_to_menus}" >
+            <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
         </a>
     </nav>
     
@@ -49,7 +49,7 @@
     	<#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
         <h2 id="${groupNameHtmlId}" pgroup="tabs" class="hidden">${groupName?capitalize}</h2>
     <#else>
-        <h2 id="properties" pgroup="tabs" class="hidden">Properties</h2>
+        <h2 id="properties" pgroup="tabs" class="hidden">${i18n().properties_capitalized}</h2>
     </#if>
         <div id="${groupNameHtmlId}Group" >
             <#-- List the properties in the group   -->
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
index a7b7bf618..28603bb28 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl
@@ -18,7 +18,7 @@
                         	<#assign groupnameHtmlId = p.createPropertyGroupHtmlId(groupname) >
                             <#-- capitalize will capitalize each word in the name; cap_first only the first. We may need a custom
                             function to capitalize all except function words. -->
-                            <li role="listitem"><a href="#${groupnameHtmlId}" title="group name">${groupname?capitalize}</a></li>
+                            <li role="listitem"><a href="#${groupnameHtmlId}" title="${i18n().group_name}">${groupname?capitalize}</a></li>
                         </#if>
                     </#list>
                 </ul>
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
index 631af8bcd..6377a922e 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-default.ftl
@@ -6,4 +6,4 @@
      is also used to generate the property statement during a deletion.  
  -->
 
-<a href="${profileUrl(statement.uri("object"))}" title="name">${statement.label!statement.localName!}</a> 
+<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.label!statement.localName!}</a> 
diff --git a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
index 997619703..47c138c01 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/propStatement-simple.ftl
@@ -1,5 +1,4 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <#-- Simple object property statement template -->
-
-<a href="${profileUrl(statement.uri("object"))}" title="name">${statement.name!}</a>  
+<a href="${profileUrl(statement.uri("object"))}" title="${i18n().name}">${statement.name!}</a>  
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index 2d8e7e34e..23ea661f1 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -4,7 +4,7 @@
 
 <#import "lib-string.ftl" as str>
 <noscript>
-<p style="padding: 20px 20px 20px 20px;background-color:#f8ffb7">This browse page requires javascript, but your browser is set to disable javascript. Either enable javascript or use the <a href="http://localhost:8080/vivo/browse" title="index page">index page</a> to browse for information.</p>
+<p style="padding: 20px 20px 20px 20px;background-color:#f8ffb7">${i18n().browse_page_javascript_one} <a href="${urls.base}/browse" title="${i18n().index_page}">${i18n().index_page}</a> ${i18n().browse_page_javascript_two}</p>
 </noscript>
 
 <section id="noJavascriptContainer" class="hidden">
@@ -20,7 +20,7 @@
                 <#assign vClassCamel = str.camelCase(vClass.name) />
                 <#-- Only display vClasses with individuals -->
                 <#if (vClass.entityCount > 0)>
-                    <li id="${vClassCamel}"><a href="#${vClassCamel}" title="Browse all individuals in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
+                    <li id="${vClassCamel}"><a href="#${vClassCamel}" title="${i18n().browse_all_in_class}" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
                 </#if>
             </#list>
         </ul>
@@ -28,9 +28,9 @@
             <h3 class="selected-class"></h3>
             <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
             <ul id="alpha-browse-individuals">
-                <li><a href="#" class="selected" data-alpha="all" title="select all">All</a></li>
+                <li><a href="#" class="selected" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
                 <#list alphabet as letter>
-                    <li><a href="#" data-alpha="${letter?lower_case}" title="Browse all individuals whose name starts with ${letter}">${letter}</a></li>
+                    <li><a href="#" data-alpha="${letter?lower_case}" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
                 </#list>
             </ul>
         </nav>
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
index 6661a019e..0ca364b49 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
@@ -22,19 +22,19 @@
         <#if user.authorizedToRebuildSearchIndex>
             <span class="contentNote">
                 <h4>Expecting content?</h4>
-                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+                <p><a title="${i18n().try_rebuilding_index}" href="${urls.base}/SearchIndex">${i18n().try_rebuilding_index}</a>.</p>
             </span>
         </#if>
     <#else>
         <span class="contentNote">
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content}</p>
         </span>
     </#if>
     
-    <h3>There is currently no ${page.title} content in the system</h3>
+    <h3>${i18n().no_content_in_system(page.title)}</h3>
     <#if user.loggedIn && user.hasSiteAdminAccess>
-        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="Manage content">${i18n().add_content_manage_site}</a> ${i18n().from_site_admin_page}</p>
     </#if>
     
-    <p>You can browse all of the public content currently in the system using the <a href="${urls.index}" title="browse all content">index page</a>.</p>
+    <p>${i18n().browse_all_public_content} <a href="${urls.index}" title="${i18n().browse_all_content}">${i18n().index_page}</a>.</p>
 </#assign>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
index f4f1db777..4fc4f9845 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
@@ -13,7 +13,7 @@
             <#else>
                 <#assign classGroupIndividualCount = classGroupIndividualCount + vClass.entityCount />
             </#if>
-            <li role="listitem"><a href="#browse-by" title="Browse all individuals in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
+            <li role="listitem"><a href="#browse-by" title="${i18n().browse_all_in_class}" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
         </#if>
     </#list>
     </ul>
diff --git a/webapp/web/templates/freemarker/body/partials/shortview/view-browse-default.ftl b/webapp/web/templates/freemarker/body/partials/shortview/view-browse-default.ftl
index 6d799a037..bf0e84143 100644
--- a/webapp/web/templates/freemarker/body/partials/shortview/view-browse-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/shortview/view-browse-default.ftl
@@ -9,11 +9,11 @@
 <#if (individual.thumbUrl)??>
     <img src="${individual.thumbUrl}" width="90" alt="${individual.name}" />
     <h1 class="thumb">
-        <a href="${individual.profileUrl}" title="View the profile page for ${individual.name}}">${individual.name}</a>
+        <a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}}">${individual.name}</a>
     </h1>
 <#else>
     <h1>
-        <a href="${individual.profileUrl}" title="View the profile page for ${individual.name}}">${individual.name}</a>
+        <a href="${individual.profileUrl}" title="${i18n().view_profile_page_for} ${individual.name}}">${individual.name}</a>
     </h1>
 </#if>
 
diff --git a/webapp/web/templates/freemarker/body/partials/shortview/view-index-default.ftl b/webapp/web/templates/freemarker/body/partials/shortview/view-index-default.ftl
index e732f00ab..e050ef4cb 100644
--- a/webapp/web/templates/freemarker/body/partials/shortview/view-index-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/shortview/view-index-default.ftl
@@ -4,6 +4,6 @@
 
 <#import "lib-properties.ftl" as p>
 
-<a href="${individual.profileUrl}" title="name">${individual.name}</a>
+<a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
 
 <@p.mostSpecificTypes individual  />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/shortview/view-search-default.ftl b/webapp/web/templates/freemarker/body/partials/shortview/view-search-default.ftl
index 05273515e..a3a4db1c7 100644
--- a/webapp/web/templates/freemarker/body/partials/shortview/view-search-default.ftl
+++ b/webapp/web/templates/freemarker/body/partials/shortview/view-search-default.ftl
@@ -4,7 +4,7 @@
 
 <#import "lib-properties.ftl" as p>
 
-<a href="${individual.profileUrl}" title="name">${individual.name}</a>
+<a href="${individual.profileUrl}" title="${i18n().name}">${individual.name}</a>
 
 <@p.mostSpecificTypes individual />
 
diff --git a/webapp/web/templates/freemarker/body/recomputeInferences.ftl b/webapp/web/templates/freemarker/body/recomputeInferences.ftl
index 5c1d1638d..c6429e8d4 100644
--- a/webapp/web/templates/freemarker/body/recomputeInferences.ftl
+++ b/webapp/web/templates/freemarker/body/recomputeInferences.ftl
@@ -2,7 +2,7 @@
 
 <#if formAction?has_content>
     <form method="post" action="${formAction}">
-        <input class="submit" type="submit" value="Recompute Inferences" name="submit" role="input" />
+        <input class="submit" type="submit" value="${i18n().recompute_inferences}" name="submit" role="input" />
     </form>
 </#if>
 
diff --git a/webapp/web/templates/freemarker/body/revisionInfo.ftl b/webapp/web/templates/freemarker/body/revisionInfo.ftl
index b5a947da3..ee7a72bd9 100644
--- a/webapp/web/templates/freemarker/body/revisionInfo.ftl
+++ b/webapp/web/templates/freemarker/body/revisionInfo.ftl
@@ -5,17 +5,17 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" />')}
 
 <section role="region">
-    <h2>Revision Information</h2>
+    <h2>${i18n().revision_info}</h2>
     
     <section id="revision-levels" role="region">
         
         <table summary="VIVO revision's levels table">
-            <caption>Levels:</caption>
+            <caption>${i18n().levels}:</caption>
             
             <tr>
-                <th>name</th>
-                <th>release</th>
-                <th>revision</th>
+                <th>${i18n().name}</th>
+                <th>${i18n().release}</th>
+                <th>${i18n().revision}</th>
             </tr>
             <#list revisionInfoBean.levelInfos as level>
                 <tr>
@@ -28,7 +28,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/revision.css" /
     </section>
     
     <section id="revision-build-date" role="region">
-        <h3>Build date:</h3>
+        <h3>${i18n().build_date}:</h3>
     
         <p>${revisionInfoBean.buildDate?datetime?string.full}</p>
     </section>
diff --git a/webapp/web/templates/freemarker/body/samples.ftl b/webapp/web/templates/freemarker/body/samples.ftl
index 4f8b63ead..3981bd6b8 100644
--- a/webapp/web/templates/freemarker/body/samples.ftl
+++ b/webapp/web/templates/freemarker/body/samples.ftl
@@ -9,60 +9,58 @@
 
 <@widget name="test" />
 
-<h3>Dates</h3>
+<h3>${i18n().dates}</h3>
 <ul>
-    <li>Current date & time: ${.now?datetime}</li>
-    <li>Current date: ${.now?date}</li>
-    <li>Current time: ${.now?time}</li>
+    <li>${i18n().current_date_time} ${.now?datetime}</li>
+    <li>${i18n().current_date} ${.now?date}</li>
+    <li>${i18n().current_time} ${.now?time}</li>
 </ul>
-<h3>Dates</h3>
 
-
-<h3>Formatted datetime</h3>
+<h3>${i18n().formatted_date_time}</h3>
 <p><p>${dt.xsdDateTimeToYear(xsddatetime)}</p>
 
-<h3>Apples</h3>
+<h3>${i18n().apples}</h3>
 <ul>
 <#list apples as apple>
     <li>${apple}</li>
 </#list>
 </ul>
 
-<h3>Fruit</h3>
+<h3>${i18n().fruit}</h3>
 <ul>
 <#list fruit as f>
     <li>${f}</li>
 </#list>
 </ul>
 
-<p><strong>Animal:</strong> ${animal}</p>
+<p><strong>${i18n().animal}</strong> ${animal}</p>
 
-<p><strong>Book Title:</strong> ${bookTitle}</p>
+<p><strong>${i18n().book_title}</strong> ${bookTitle}</p>
 
 
-<h3>Zoo 1</h3>
+<h3>${i18n().zoo_one}</h3>
 <ul>
 <#list zoo1.animals as animal>
     <li>${animal}</li>
 </#list>
 </ul>
 
-<h3>Zoo 2</h3>
+<h3>${i18n().zoo_two}</h3>
 <ul>
 <#list zoo2.animals as animal>
     <li>${animal}</li>
 </#list>
 </ul>
 
-<p><strong>Berries: </strong>${berries}</p>
+<p><strong>${i18n().berries} </strong>${berries}</p>
 
 <p>${year?number?c}</p>
 
-<h3>Raw String Literals</h3>
+<h3>${i18n().raw_string_literals}</h3>
 <p>${r"#{title}"}</p>
 <p>${r"${title}"}</p>
 
-<h2>Containers do not pick up changes to the value of their elements</h2>
+<h2>${i18n().containers_do_not_pick_up_changes}</h2>
 <#assign
     fruit = ["apples", "oranges", "bananas"]
     veg = ["beans", "peas", "carrots"]
@@ -79,12 +77,12 @@
     ><br />
 </#noparse>
 
-<h3>List elements of ${r"${fruit}"}</h3>
+<h3>${i18n().list_elements_of} ${r"${fruit}"}</h3>
 <#list fruit as f>
     ${f}<br />
 </#list>
 
-<h3>List elements of ${r"${food}"}: contains no pears</h3>
+<h3>${i18n().list_elements_of} ${r"${food}"}: ${i18n().contains_no_pears}</h3>
 <#list food as item>
     <#list item as i>
         ${i}<br />
@@ -92,7 +90,7 @@
 </#list>
 
 
-<h3>Numbers</h3>
+<h3>${i18n().numbers}</h3>
 
 <#assign
     one = 1
@@ -116,7 +114,7 @@ ${r"${two}"}: ${two}<br />
 ${r"${numbers[1]}"}: ${numbers[1]}<br />
 ${r"${numbers2[1]}"}: ${numbers2[1]}<br />
 
-<h3>Uncamelcasing</h3>
+<h3>${i18n().undo_camelcasing}</h3>
 <#assign s1 = "FreemarkerTest">
 ${s1} => ${str.unCamelCase(s1)}<br />
 <#assign s2 = "Freemarker">
diff --git a/webapp/web/templates/freemarker/body/sdbSetup.ftl b/webapp/web/templates/freemarker/body/sdbSetup.ftl
index abfe18e69..d861d677c 100644
--- a/webapp/web/templates/freemarker/body/sdbSetup.ftl
+++ b/webapp/web/templates/freemarker/body/sdbSetup.ftl
@@ -3,7 +3,7 @@
 <#if link??>
     <form method="post" action="sdbsetup">
         <p>${sdbstatus}</p>
-        <input type="submit" value="Run SDB Setup" name="submit"/>
+        <input type="submit" value="${i18n().run_sdb_setup}" name="submit"/>
         <input type="hidden" value="setup" name="setupsignal">
     </form>
 </#if>
diff --git a/webapp/web/templates/freemarker/body/search/search-help_es.ftl b/webapp/web/templates/freemarker/body/search/search-help_es.ftl
new file mode 100644
index 000000000..bde61733d
--- /dev/null
+++ b/webapp/web/templates/freemarker/body/search/search-help_es.ftl
@@ -0,0 +1,42 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#if origination?has_content && origination == "helpLink">
+    <h2>Consejos Para la Búsqueda</h2>
+    <span id="searchHelp">
+        <a href="#" onClick="history.back();return false;" title="regresar a los resultados">regresar a los resultados</a>
+    </span>
+<#else>
+    <h3>Consejos Para la Búsqueda</h3>        
+</#if>
+<ul class="searchTips">
+    <li>Debe ser sencillo. Utilice corto, único a menos que las búsquedas están regresando muchos resultados.</li>
+    <li>Utilice comillas para buscar una frase entera -- por ejemplo, "<i>el plegamiento de proteínas</i>".</li>
+    <li>A excepción de los operadores booleanos, búsquedas <strong>no distinguen</strong> entre mayúsculas y minúsculas, por lo que "Ginebra" y "ginebra" son equivalentes</li>
+    <li>Si no está seguro de la ortografía correcta, ponga ~ al final de su término de búsqueda -- por ejemplo, <i>cabage~</i> encuentra <i>cabbage</i>, <i>steven~</i> encuentra <i>Stephen</i> y <i>Stefan</i> (así como otros nombres similares).</li>
+</ul>
+    
+<h4><a id="advTipsLink" href="#">Consejos Avanzados</a></h4>    
+<ul id="advanced" class="searchTips" style="visibility:hidden">
+    <li>Cuando se introduce más de un término, la búsqueda devolverá resultados que contengan todas ellas a menos que agregue el operador booleano "OR" -- por ejemplo, <i>pollo</i> OR <i>huevos</i>.</li>
+    <li>"NOT" puede ayudar búsquedas límite -- por ejemplo, <i>clima</i> NOT <i>cambiar</i>.</li>
+    <li>Las búsquedas de frases se pueden combinar con operadores booleanos -- por exemplo, "<i>cambio climático</i>" OR "<i>calentamiento global</i>".</li>
+    <li>Asimismo, se encuentra cerca variaciones de palabras -- por exemplo, <i>secuencia</i> emparejas <i>secuencias</i> y <i>secuenciación</i>.</li>
+    <li>Utilice el carácter comodín * para que coincida con una variación aún mayor -- por exemplo, <i>nano*</i> emparejas <i>nanotechnology</i> y <i>nanofabrication</i>.</li>
+    <li>Search utiliza versiones acortadas de palabras -- por exemplo, una búsqueda de "cogni*" no encuentra nada, mientras que la "cogn*" encuentra tanto <i>cognitivo</i> and <i>cognición</i>.</li> 
+</ul>
+<a id="closeLink" href="#"  style="visibility:hidden;font-size:.825em;padding-left:8px">Close</a>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/search.css" />')}
+<script type="text/javascript">
+    $(document).ready(function(){
+        $('a#advTipsLink').click(function() {
+           $('ul#advanced').css("visibility","visible"); 
+           $('a#closeLink').css("visibility","visible");
+           $('a#closeLink').click(function() {
+              $('ul#advanced').css("visibility","hidden"); 
+              $('a#closeLink').css("visibility","hidden");
+           });
+
+        });
+    });
+    
+</script>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
index 4cd221ac6..c7d84eebe 100644
--- a/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/web/templates/freemarker/body/search/search-pagedResults.ftl
@@ -7,9 +7,9 @@
 
 <h2 style="float:left">
 <#escape x as x?html>
-    Search results for '${querytext}'
-    <#if classGroupName?has_content>limited to type '${classGroupName}'</#if>
-    <#if typeName?has_content>limited to type '${typeName}'</#if>
+    ${i18n().search_results_for} '${querytext}'
+    <#if classGroupName?has_content>${i18n().limited_to_type} '${classGroupName}'</#if>
+    <#if typeName?has_content>${i18n().limited_to_type} '${typeName}'</#if>
 </#escape>
 <script type="text/javascript">
 	var url = window.location.toString();	
@@ -23,6 +23,7 @@
 	var urlsBase = '${urls.base}';
 </script>
 </h2>
+<<<<<<< HEAD
 
 <span id="downloadResults" title="Download Results">
 	<img id="downloadIcon" src="images/download-icon.png" alt="Download Results"  />
@@ -32,13 +33,16 @@
 
 <div class="contentsBrowseGroup" style="clear:left">
 
+<span id="searchHelp"><a href="${urls.base}/searchHelp" title="${i18n().search_help}">${i18n().not_expected_results}</a></span>
+<div class="contentsBrowseGroup">
+
     <#-- Refinement links -->
     <#if classGroupLinks?has_content>
         <div class="searchTOC">
-            <h4>Display only</h4>           
+            <h4>${i18n().display_only}</h4>           
             <ul>           
             <#list classGroupLinks as link>
-                <li><a href="${link.url}" title="class group link">${link.text}</a><span>(${link.count})</span></li>
+                <li><a href="${link.url}" title="${i18n().class_group_link}">${link.text}</a><span>(${link.count})</span></li>
             </#list>
             </ul>           
         </div>
@@ -47,13 +51,13 @@
     <#if classLinks?has_content>
         <div class="searchTOC">
             <#if classGroupName?has_content>
-                <h4>Limit ${classGroupName} to</h4>
+                <h4>${i18n().limit} ${classGroupName} to</h4>
             <#else>
-                <h4>Limit to</h4>
+                <h4>${i18n().limit_to}</h4>
             </#if>
             <ul>           
             <#list classLinks as link>
-                <li><a href="${link.url}" title="class link">${link.text}</a><span>(${link.count})</span></li>
+                <li><a href="${link.url}" title="${i18n().class_link}">${link.text}</a><span>(${link.count})</span></li>
             </#list>
             </ul>
         </div>
@@ -73,15 +77,15 @@
     <#if (pagingLinks?size > 0)>
         <div class="searchpages">
             Pages: 
-            <#if prevPage??><a class="prev" href="${prevPage}" title="previous">Previous</a></#if>
+            <#if prevPage??><a class="prev" href="${prevPage}" title="${i18n().previous}">${i18n().previous}</a></#if>
             <#list pagingLinks as link>
                 <#if link.url??>
-                    <a href="${link.url}" title="page link">${link.text}</a>
+                    <a href="${link.url}" title="${i18n().page_link}">${link.text}</a>
                 <#else>
                     <span>${link.text}</span> <#-- no link if current page -->
                 </#if>
             </#list>
-            <#if nextPage??><a class="next" href="${nextPage}" title="next">Next</a></#if>
+            <#if nextPage??><a class="next" href="${nextPage}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a></#if>
         </div>
     </#if>
     <br />
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
index ed95a2f4e..6485df7d5 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-advancedDataTools.ftl
@@ -4,23 +4,23 @@
 
 <#if dataTools?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Advanced Data Tools</h3>
+        <h3>${i18n().advanced_data_tools}</h3>
         
         <ul role="navigation">
             <#if dataTools.rdfData?has_content>
-                <li role="listitem"><a href="${dataTools.rdfData}" title="Add/Remove RDF data">Add/Remove RDF data</a></li>
+                <li role="listitem"><a href="${dataTools.rdfData}" title="${i18n().add_remove_rdf}">${i18n().add_remove_rdf}</a></li>
             </#if>     
             <#if dataTools.ingest?has_content>
-                <li role="listitem"><a href="${dataTools.ingest}" title="Ingest tools">Ingest tools</a></li>
+                <li role="listitem"><a href="${dataTools.ingest}" title="${i18n().ingest_tools}">${i18n().ingest_tools}</a></li>
             </#if>     
             <#if dataTools.rdfExport?has_content>
-                <li role="listitem"><a href="${dataTools.rdfExport}" title="RDF export">RDF export</a></li>
+                <li role="listitem"><a href="${dataTools.rdfExport}" title="${i18n().rdf_export}">${i18n().rdf_export}</a></li>
             </#if>     
             <#if dataTools.sparqlQuery?has_content>
-                <li role="listitem"><a href="${dataTools.sparqlQuery}" title="SPARQL query">SPARQL query</a></li>
+                <li role="listitem"><a href="${dataTools.sparqlQuery}" title="${i18n().sparql_query}">${i18n().sparql_query}</a></li>
             </#if>     
             <#if dataTools.sparqlQueryBuilder?has_content>
-                <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}" title="SPARQL query builder">SPARQL query builder</a></li>
+                <li role="listitem"><a href="${dataTools.sparqlQueryBuilder}" title="${i18n().sparql_query_builder}">${i18n().sparql_query_builder}</a></li>
             </#if>     
         </ul>
     </section>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
index a5145a170..dc402f436 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-classHierarchy.ftl
@@ -8,23 +8,23 @@
         <#assign displayOption = "asserted">
     </#if>
     <form name="classHierarchyForm" id="classHierarchyForm" action="showClassHierarchy" method="post" role="classHierarchy">
-        <label id="displayOptionLabel" class="inline">Display Options</label>
+        <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
         <select id="displayOption" name="displayOption">
-            <option value="asserted" <#if displayOption == "asserted">selected</#if> >Asserted Class Hierarchy</option>
-            <option  value="inferred" <#if displayOption == "inferred">selected</#if> >Inferred Class Hierarchy</option>
-            <option value="all" <#if displayOption == "all">selected</#if> >All Classes</option>
-            <option value="group" <#if displayOption == "group">selected</#if> >Classes by Class Group</option>
+            <option value="asserted" <#if displayOption == "asserted">selected</#if> >${i18n().asserted_class_hierarchy}</option>
+            <option  value="inferred" <#if displayOption == "inferred">selected</#if> >${i18n().inferred_class_hierarchy}</option>
+            <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_classes}</option>
+            <option value="group" <#if displayOption == "group">selected</#if> >${i18n().classes_by_classgroup}</option>
         </select>
-        <input id="addClass" value="Add New Class" class="form-button" type="submit" />
+        <input id="addClass" value="${i18n().add_new_classes}" class="form-button" type="submit" />
         <#if displayOption == "group">
-                <input type="submit" id="addGroup" class="form-button" value="Add New Group"/>
+                <input type="submit" id="addGroup" class="form-button" value="${i18n().add_new_group}"/>
         </#if>
     </form>
         
     <#if displayOption == "group">
-        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="hide/show subclasses">hide subclasses</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_subclasses}">${i18n().hide_subclasses}</a></span></div>
     <#else>
-        <div id="expandLink"><span id="expandAll" ><a href="#" title="expand all">expand all</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
     </#if>
     <section id="container">
 
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index f2ba1d995..f3092db01 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -6,18 +6,18 @@
 
 <#if dataInput?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Data Input</h3>
+        <h3>${i18n().data_input}</h3>
 
         <form id="addIndividualClass" action="${dataInput.formAction}" method="get">
             <select id="VClassURI" name="typeOfNew" class="form-item long-options" role="select">
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
             <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.NewIndividualFormGenerator" role="input" />
-            <input type="submit" id="submit" value="Add individual of this class" role="button" />
+            <input type="submit" id="submit" value="${i18n().add_individual_of_class}" role="button" />
         </form>
         
         <section id="addClassBubble" role="region">
-            <p>Please create a <a title="Create a class gorup" href="${urls.base}/editForm?controller=Classgroup">class group</a> and associate classes with the group created.</p>
+            <p>${i18n().please_create} <a title="${i18n().create_classgroup}" href="${urls.base}/editForm?controller=Classgroup">${i18n().a_classgroup}</a> ${i18n().associate_classes_with_group}</p>
         </section>
     </section>
 </#if>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
index cfe3d7554..87adb5232 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-indexCacheRebuild.ftl
@@ -4,19 +4,19 @@
 
 <#if indexCacheRebuild?has_content>
     <section class="pageBodyGroup indexCacheRebuild" role="region">
-        <h3>Refresh Content</h3>
+        <h3>${i18n().refresh_content}</h3>
         
         <ul role="navigation">                        
             <#if indexCacheRebuild.rebuildSearchIndex?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.rebuildSearchIndex }" title="Rebuild search index">Rebuild search index</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildSearchIndex }" title="${i18n().rebuild_search_index}">${i18n().rebuild_search_index}</a></li>
             </#if>
             
             <#if indexCacheRebuild.rebuildVisCache?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.rebuildVisCache}" title="Rebuild visualization cache">Rebuild visualization cache</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.rebuildVisCache}" title="${i18n().rebuild_vis_cache}">${i18n().rebuild_vis_cache}</a></li>
             </#if>
             
             <#if indexCacheRebuild.recomputeInferences?has_content>
-                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="Recompute inferences">Recompute inferences</a></li>
+                <li role="listitem"><a href="${indexCacheRebuild.recomputeInferences}" title="${i18n().recompute_inferences}">${i18n().recompute_inferences_mixed_caps}</a></li>
             </#if>
         </ul>
     </section>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
index ad539f33d..ef8bb2242 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-main.ftl
@@ -5,7 +5,7 @@
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/admin.css" />')}
 
 <div class="tab">
-    <h2>Site Administration</h2>
+    <h2>${i18n().site_administration}</h2>
 </div>
 
 <div id="adminDashboard">
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
index a28f9bdcb..8bf02db0c 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-objectPropHierarchy.ftl
@@ -22,21 +22,21 @@
    
     <#if propType == "group">
         <form action="editForm" method="get">
-            <input type="submit" class="form-button" id="addProperty" value="Add new property group"/>
+            <input type="submit" class="form-button" id="addProperty" value="${i18n().add_property_group}"/>
             <input type="hidden" name="controller" value="PropertyGroup"/>
         </form>
-        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="hide/show properties">hide properties</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="javascript:" title="${i18n().hide_show_properties}">${i18n().hide_properties}</a></span></div>
     <#else>
         <form name="classHierarchyForm" id="classHierarchyForm" action="show<#if propType == "object">Object<#else>Data</#if>PropertyHierarchy" method="post" role="classHierarchy">
-        <label id="displayOptionLabel" class="inline">Display Options</label>
+        <label id="displayOptionLabel" class="inline">${i18n().display_options}</label>
             <select id="displayOption" name="displayOption">
-                <option value="hierarchy" <#if displayOption == "asserted">selected</#if> >${propType?capitalize} Property Hierarchy</option>
-                <option value="all" <#if displayOption == "all">selected</#if> >All ${propType?capitalize} Properties</option>
-                <option value="group" <#if displayOption == "group">selected</#if> >Property Groups</option>
+                <option value="hierarchy" <#if displayOption == "asserted">selected</#if> >${propType?capitalize} ${i18n().property_hierarchy}</option>
+                <option value="all" <#if displayOption == "all">selected</#if> >${i18n().all_x_properties(propType?capitalize)}</option>
+                <option value="group" <#if displayOption == "group">selected</#if> >${i18n().property_groups}</option>
             </select>
-            <input type="submit" class="form-button" id="addProperty" value="Add new <#if propType == "object">object<#else>data</#if> property"/>
+            <input type="submit" class="form-button" id="addProperty" value="${i18n().add_new} <#if propType == "object">${i18n().object}<#else>${i18n().data}</#if> ${i18n().property}"/>
         </form>
-        <div id="expandLink"><span id="expandAll" ><a href="#" title="expand all">expand all</a></span></div>
+        <div id="expandLink"><span id="expandAll" ><a href="#" title="${i18n().expand_all}">${i18n().expand_all}</a></span></div>
     </#if>
 
     <section id="container">
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
index 6d4c8c7dd..83bb18a4c 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
@@ -4,36 +4,36 @@
 
 <#if ontologyEditor?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Ontology Editor</h3>
+        <h3>${i18n().ontology_editor}</h3>
         
         <#if ontologyEditor.pellet?has_content>
             <div class="notice">
                 <p>${ontologyEditor.pellet.error}</p>
                 <#if ontologyEditor.pellet.explanation?has_content>
-                    <p>Cause: ${ontologyEditor.pellet.explanation}</p>
+                    <p>${i18n().cause} ${ontologyEditor.pellet.explanation}</p>
                 </#if>
             </div>
         </#if>
         
         <ul role="navigation">
             <li role="listitem">
-                <a href="${ontologyEditor.urls.ontologies}" title="Ontology list">Ontology list</a></h4>
+                <a href="${ontologyEditor.urls.ontologies}" title="${i18n().ontology_list}"></a>${i18n().ontology_list}</h4>
             </li>
         </ul>
     
-        <h4>Class Management</h4>
+        <h4>${i18n().class_management}</h4>
         
         <ul role="navigation">
-            <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}" title="Class hierarchy">Class hierarchy</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.classGroups}" title="Class groups">Class groups</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.classHierarchy}" title="${i18n().class_hierarchy}">${i18n().class_hierarchy}</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.classGroups}" title="${i18n().class_groups}">${i18n().class_groups}</a></li>
         </ul>
         
-        <h4>Property Management</h4>
+        <h4>${i18n().property_management}</h4>
         
         <ul role="navigation">
-            <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="Object property hierarchy">Object property hierarchy</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="Data property hierarchy">Data property hierarchy</a></li>
-            <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="Property groups">Property groups</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.objectPropertyHierarchy}" title="${i18n().object_property_hierarchy}">${i18n().object_property_hierarchy}</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.dataPropertyHierarchy}" title="${i18n().data_property_hierarchy}">${i18n().data_property_hierarchy}</a></li>
+            <li role="listitem"><a href="${ontologyEditor.urls.propertyGroups}" title="${i18n().property_groups}">${i18n().property_groups}</a></li>
         </ul>
         
     </section>
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index d9b5ca049..b5129203d 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -4,44 +4,44 @@
 
 <#if siteConfig?has_content>
     <section class="pageBodyGroup" role="region">
-        <h3>Site Configuration</h3>
+        <h3>${i18n().site_config}</h3>
         
         <ul role="navigation">
             <#if siteConfig.internalClass?has_content>
-                <li role="listitem"><a href="${siteConfig.internalClass}" title="Institutional internal class">Institutional internal class</a></li>
+                <li role="listitem"><a href="${siteConfig.internalClass}" title="${i18n().internal_class}">${i18n().internal_class}</a></li>
             </#if>     
             
             <#if siteConfig.manageProxies?has_content>
-                <li role="listitem"><a href="${siteConfig.manageProxies}" title="Manage profile editing">Manage profile editing</a></li>
+                <li role="listitem"><a href="${siteConfig.manageProxies}" title="${i18n().manage_profile_editing}">${i18n().manage_profile_editing}</a></li>
             </#if>  
             
             <#if siteConfig.pageManagement?has_content>
-                <li role="listitem"><a href="${siteConfig.pageManagement}" title="Page management">Page management</a></li>
+                <li role="listitem"><a href="${siteConfig.pageManagement}" title="${i18n().page_management}">${i18n().page_management}</a></li>
             </#if>        
             
             <#if siteConfig.menuManagement?has_content>
-                <li role="listitem"><a href="${siteConfig.menuManagement}" title="Menu ordering">Menu ordering</a></li>
+                <li role="listitem"><a href="${siteConfig.menuManagement}" title="${i18n().menu_ordering}">${i18n().menu_ordering_mixed_caps}</a></li>
             </#if>      
             
             <#if siteConfig.restrictLogins?has_content>
-                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="Restrict Logins">Restrict Logins</a></li>
+                <li role="listitem"><a href="${siteConfig.restrictLogins}" title="${i18n().restrict_logins}">${i18n().restrict_logins_mixed_caps}</a></li>
             </#if>
             
             <#if siteConfig.siteInfo?has_content>
-                <li role="listitem"><a href="${siteConfig.siteInfo}" title="Site information">Site information</a></li>
+                <li role="listitem"><a href="${siteConfig.siteInfo}" title="${i18n().site_information}">${i18n().site_information}</a></li>
             </#if>
             
             <#if siteConfig.startupStatus?has_content>
                 <li role="listitem">
-                    <a href="${siteConfig.startupStatus}" title="Startup status">Startup status</a>
+                    <a href="${siteConfig.startupStatus}" title="${i18n().startup_status}">${i18n().startup_status}</a>
                     <#if siteConfig.startupStatusAlert>
-                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alert="Error alert icon" />
+                        <img id="alertIcon" src="${urls.images}/iconAlert.png" width="20" height="20" alt="${i18n().error_alert_icon}" />
                     </#if>
                 </li>
             </#if>   
             
              <#if siteConfig.userAccounts?has_content>
-                <li role="listitem"><a href="${siteConfig.userAccounts}" title="User accounts">User accounts</a></li>
+                <li role="listitem"><a href="${siteConfig.userAccounts}" title="${i18n().user_accounts}">${i18n().user_accounts}</a></li>
              </#if>        
         </ul>
     </section>
diff --git a/webapp/web/templates/freemarker/body/termsOfUse_es.ftl b/webapp/web/templates/freemarker/body/termsOfUse_es.ftl
new file mode 100644
index 000000000..76a8ccdda
--- /dev/null
+++ b/webapp/web/templates/freemarker/body/termsOfUse_es.ftl
@@ -0,0 +1,41 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<section id="terms" role="region">
+    <h2>Condiciones de uso</h2>
+    
+    <h3>Aviso legal</h3>
+
+    <p>Este ${termsOfUse.siteName} sitio web contiene material&mdash;información de texto, la publicación
+    citas, enlaces e imágenes&mdash;proporcionado por ${termsOfUse.siteHost} y varios terceros, tanto de los
+    individuos y las organizaciones, comerciales y de otro tipo. En la medida de derecho de autor, la información
+    presentada en el sitio web VIVO y disponible como Resource Description Framework (RDF) datos de VIVO en
+    ${termsOfUse.siteHost} se destina para uso público y se distribuye libremente bajo los términos de la 
+    <a href="http://creativecommons.org/licenses/by/3.0/" target="_blank" title="creative commons">Creative Commons
+    CC-BY 3.0</a> licencia, que le permite copiar, distribuir, mostrar y hacer que los derivados de esta
+    información, siempre le das crédito a ${termsOfUse.siteHost}. Cualquier información que no sea derecho de autor
+    está disponible para usted en virtud de una 
+    <a href="http://creativecommons.org/publicdomain/zero/1.0/"  target="_blank" title="cco waiver">exención
+    CC0</a>. Sin embargo, los documentos originales, imágenes o páginas web adjuntas o vinculado desde VIVO podrán
+    contener información con derechos de autor y sólo deben ser utilizados o distribuidos en los términos que se
+    incluyen con cada fuente o de acuerdo con los principios del uso justo.</p>    
+
+    <h3>Descargo de responsabilidad</h3>
+
+    <p>${termsOfUse.siteHost?cap_first} ofrece ninguna garantía, expresa o implícita, incluyendo las garantías de
+    comerciabilidad y adecuación a un propósito particular, o asume cualquier responsabilidad legal o responsabilidad
+    por la exactitud, integridad, actualidad o utilidad de cualquier material mostrado o distribuido a través de la
+    página web ${termsOfUse.siteName} o representa que su uso no infringiría derechos de propiedad privada.
+    ${termsOfUse.siteHost?cap_first} renuncia a cualquier garantía con respecto a la información proporcionada. Si
+    usted confía en dicha información es a su propio riesgo. En ningún caso ${termsOfUse.siteHost} será responsable
+    ante usted por daños o pérdidas que resulten de o causados ​​por el sitio web ${termsOfUse.siteName} o su
+    contenido.</p> 
+
+    <h3>Renuncia de aprobación</h3>
+
+    <p>La referencia en este documento a cualquier producto comercial específico, proceso o servicio por nombre
+    comercial, marca, fabricante, o de otro modo, no constituye necesariamente ni implica un endoso o recomendación 
+    por parte de ${termsOfUse.siteHost}. Los puntos de vista y opiniones de los autores expresadas en este documento 
+    no representan ni reflejan necesariamente las de Cornell y no podrá ser utilizado para fines publicitarios o 
+    endoso de productos.</p> 
+    
+</section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
index 8ff7a735e..398df7e74 100644
--- a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
+++ b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
@@ -3,13 +3,12 @@
 <#-- Template for the Unrecognized User page. -->
 
 <section role="region">
-    <h2>Unrecognized user</h2>
+    <h2>${i18n().unrecognized_user}</h2>
     
     <p>
-      For some reason, there is no individual in VIVO that is associated with your Net ID. 
-      Perhaps you should contact your VIVO administrator.
+      ${i18n().no_individual_associated_with_id}
     </p>
 
     <br/>
-    <a href="${urls.home}" title="continue">Continue</a>
+    <a href="${urls.home}" title="${i18n().continue}">${i18n().continue}</a>
 </section>
diff --git a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index 34afb30b8..d1ae02c59 100644
--- a/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
@@ -27,19 +27,19 @@
 	<#assign propertyNameForDisplay = editConfiguration.objectPropertyNameForDisplay />
 </#if>
 <#if editMode = "edit" >
-	<#assign titleVerb = "Edit" />
+	<#assign titleVerb = "${i18n().edit_capitalized}" />
 	<#assign objectLabel = editConfiguration.pageData.objectLabel />
 	<#assign selectedObjectUri = editConfiguration.objectUri />
-	<#assign submitButtonText = "Save Change" />
+	<#assign submitButtonText = "${i18n().save_button}" />
 <#else>
-	<#assign titleVerb = "Add" >
+	<#assign titleVerb = "${i18n().add_capitalized}" >
 	<#assign objectLabel = "" />
 	<#assign selectedObjectUri = ""/>
-	<#assign submitButtonText = "Create Entry" />
+	<#assign submitButtonText = "${i18n().create_entry}" />
 </#if>
 
 <#if editConfiguration.formTitle?contains("collaborator") >
-    <#assign formTitle = "Select an existing Collaborator for ${editConfiguration.subjectName}" />
+    <#assign formTitle = "${i18n().select_existing_collaborator(editConfiguration.subjectName)}" />
 <#else>
     <#assign formTitle = editConfiguration.formTitle />
 </#if>
@@ -58,16 +58,16 @@
              
             <#---This section should become autocomplete instead--> 
             <p>
-				<label for="object"> ${propertyNameForDisplay?capitalize} Name<span class='requiredHint'> *</span></label>
+				<label for="object"> ${propertyNameForDisplay?capitalize} ${i18n().name_capitalized}<span class='requiredHint'> *</span></label>
 				<input class="acSelector" size="50"  type="text" id="object" name="objectLabel" acGroupName="object" value="${objectLabel}" />
 			</p>
 								
 			<div class="acSelection" acGroupName="object" > 
 				<p class="inline">
-					<label>Selected:</label> 
+					<label>${i18n().selected}:</label> 
 					<span class="acSelectionInfo"></span>
-					<a href="" class="verifyMatch"  title="verify match">(Verify this match</a> or 
-                    <a href="#" class="changeSelection" id="changeSelection">change selection)</a>
+					<a href="" class="verifyMatch"  title="${i18n().verify_this_match}">(${i18n().verify_this_match}</a> ${i18n().or} 
+                    <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
                 </p>
                 <input class="acUriReceiver" type="hidden" id="objectVar" name="objectVar" value="${selectedObjectUri}" />
 			</div>
@@ -78,11 +78,11 @@
                 <input type="submit" id="submit" value="${submitButtonText}" role="button" disabled="disabled"/>
            
                 <span class="or"> or </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no entries in the system from which to select.  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
     </#if>
 </#if>
 <p>&nbsp;</p>
@@ -92,7 +92,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 
diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 74e540526..263c73053 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -16,7 +16,7 @@
 <#assign deletionTemplateName = editConfiguration.deleteTemplate/>
 
 <form action="${editConfiguration.deleteProcessingUrl}" method="get">
-    <h2>Are you sure you want to delete the following entry from <em>${editConfiguration.propertyName}</em>?</h2>
+    <h2>${i18n().confirm_entry_deletion_from} <em>${editConfiguration.propertyName}</em>?</h2>
     
     <p class="toBeDeleted ${toBeDeletedClass}">
         <#if editConfiguration.objectProperty = true>
@@ -42,9 +42,9 @@
     <#if editConfiguration.objectProperty = true>
     <p class="submit">
     </#if>
-        <input type="submit" id="submit" value="Delete" role="button"/>
+        <input type="submit" id="submit" value="${i18n().delete_button}" role="button"/>
         or 
-        <a class="cancel" title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+        <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
     <#if editConfiguration.objectProperty = true>
     </p>
     </#if>
diff --git a/webapp/web/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl b/webapp/web/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
index fac8f7651..c7139c5c6 100644
--- a/webapp/web/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/dateTimeIntervalForm.ftl
@@ -7,12 +7,12 @@
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
 <#if editMode == "edit">        
-        <#assign titleVerb="Edit">        
-        <#assign submitButtonText="Edit Date/Time Value">
+        <#assign titleVerb="${i18n().edit_capitalized}">        
+        <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="Create">        
-        <#assign submitButtonText="Create Date/Time Value">
+        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
 <#--If edit submission exists, then retrieve validation errors if they exist-->
@@ -21,25 +21,25 @@
 </#if>
 
 
-<h2>${titleVerb} date time value for ${editConfiguration.subjectName}</h2>
+<h2>${titleVerb} ${i18n().date_time_value_for} ${editConfiguration.subjectName}</h2>
 
 <#--Display error messages if any-->
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#--below shows examples of both printing out all error messages and checking the error message for a specific field-->
         <#list submissionErrors?keys as errorFieldName>
         	<#if errorFieldName == "startField">
         	    <#if submissionErrors[errorFieldName]?contains("before")>
-        	        The Start interval must be earlier than the End interval.
+        	        ${i18n().start_interval_must_precede_end_earlier}
         	    <#else>
         	        ${submissionErrors[errorFieldName]}
         	    </#if>
         	    <br />
         	<#elseif errorFieldName == "endField">
     	        <#if submissionErrors[errorFieldName]?contains("after")>
-    	            The End interval must be later than the Start interval.
+    	            ${i18n().end_interval_must_follow_start_interval}
     	        <#else>
     	            ${submissionErrors[errorFieldName]}
     	        </#if>
@@ -52,20 +52,20 @@
 <p></p>
 <#--Need to draw edit elements for dates here-->
  <#if htmlForElements?keys?seq_contains("startField")>
-	Start&nbsp; ${htmlForElements["startField"]}
+	${i18n().start_capitalized}&nbsp; ${htmlForElements["startField"]}
  </#if>
  <br /><br />
  <#if htmlForElements?keys?seq_contains("endField")>
-	End&nbsp; ${htmlForElements["endField"]}
+	${i18n().end_capitalized}&nbsp; ${htmlForElements["endField"]}
  </#if>
 
     <p class="submit">
         <input type="hidden" name="editKey" value="${editKey}" />
         <input type="submit" id="submit" value="${submitButtonText}" role="button" />
     
-        <span class="or"> or </span>
+        <span class="or"> ${i18n().or} </span>
     
-        <a class="cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
+        <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
 
diff --git a/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl b/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
index 69c461a3e..8596e3497 100644
--- a/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/dateTimeValueForm.ftl
@@ -7,16 +7,16 @@
 <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
 
 <#if editMode == "edit">        
-        <#assign titleVerb="Edit">        
-        <#assign submitButtonText="Edit Date/Time Value">
+        <#assign titleVerb="${i18n().edit_capitalized}">        
+        <#assign submitButtonText="${i18n().edit_date_time_value}">
         <#assign disabledVal="disabled">
 <#else>
-        <#assign titleVerb="Create">        
-        <#assign submitButtonText="Create Date/Time Value">
+        <#assign titleVerb="${i18n().create_capitalized}">        
+        <#assign submitButtonText="${i18n().create_date_time_value}">
         <#assign disabledVal=""/>
 </#if>
 
-<h2>${titleVerb} date time value for ${editConfiguration.subjectName}</h2>
+<h2>${titleVerb} ${i18n().date_time_value_for} ${editConfiguration.subjectName}</h2>
 
 <form class="customForm" action ="${submitUrl}" class="customForm">
 <#--Need to draw edit elements for dates here-->
@@ -28,9 +28,9 @@
         <input type="hidden" name="editKey" value="${editKey}" />
         <input type="submit" id="submit" value="${submitButtonText}" role="button" />
     
-        <span class="or"> or </span>
+        <span class="or"> ${i18n().or} </span>
     
-        <a class="cancel" href="${editConfiguration.cancelUrl}" title="Cancel">Cancel</a>
+        <a class="cancel" href="${editConfiguration.cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 </form>
 ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />',
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
index 5e8dfca28..794874164 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
@@ -4,11 +4,11 @@
  "${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName}
 </#assign>
 <#if editConfiguration.objectUri?has_content>
-    <#assign formTitle>Edit ${formTitle} </#assign>
-    <#assign submitLabel>Save changes</#assign>
+    <#assign formTitle>${i18n().edit_capitalized} ${formTitle} </#assign>
+    <#assign submitLabel>${i18n().save_changes}</#assign>
 <#else>
-    <#assign formTitle>Create ${formTitle} </#assign>
-    <#assign submitLabel>Create "${editConfiguration.propertyPublicDomainTitle}" entry</#assign>
+    <#assign formTitle>${i18n().create_capitalized} ${formTitle} </#assign>
+    <#assign submitLabel>${i18n().create_capitalized} "${editConfiguration.propertyPublicDomainTitle}" ${i18n().entry}</#assign>
 </#if>
 
 <h2>${formTitle}</h2>
@@ -20,6 +20,6 @@
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="submit" />
         <span class="or"> or </span>
-        <a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+        <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
     </p>     
 </form>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
index a998410df..2314c3fc4 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
@@ -11,7 +11,7 @@
 <#--Display error messages if any-->
 <#if submissionErrors?has_content>
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         
         <#list submissionErrors?keys as errorFieldName>
@@ -39,7 +39,7 @@
     but that method may not return the correct result for other custom forms-->
     <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
     <span class="or"> or </span>
-    <a title="Cancel" href="${cancelUrl}">Cancel</a>
+    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
 
 </form>
 
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index d46a1029b..a0108959a 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <form class="deleteForm" action="${editConfiguration.mainEditUrl}" method="get"> 
-    <h3 class="delete-entry">Delete this entry?</h3>
+    <h3 class="delete-entry">${i18n().delete_entry_capitalized}</h3>
           
     <label for="delete"></label>
     
@@ -11,7 +11,7 @@
     <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
     <#if editConfiguration.dataProperty = true>
         <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
-        <input type="submit" id="delete" value="Delete" role="button "/>
+        <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
     </#if>
     
     <#--The original jsp included vinput tag with cancel=empty string for case where both select from existing
@@ -21,15 +21,15 @@
     
         <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
             <p>
-                <input type="submit" id="delete" value="Delete" role="button "/>
-                <span class="or"> or </span>
-                <a title="Cancel" href="${editConfiguration.cancelUrl}">Cancel</a>
+                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
+                <span class="or"> ${i18n().or} </span>
+                <a title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
             </p> 
         </#if>
         
         <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
             <p>
-                <input type="submit" id="delete" value="Delete" role="button "/>
+                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
             </p>      
         </#if>
     </#if>
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
index ca9ce6e31..baead0177 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
@@ -1,9 +1,9 @@
  <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
  
  <#if rangeOptionsExist  = true >
-        <p>If you don't find the appropriate entry on the selection list above:</p>
+        <p>${i18n().no_appropriate_entry}:</p>
  <#else>
-        <p>Please create a new entry.</p>           
+        <p>${i18n().create_new_entry}</p>           
  </#if>
  
  <#if editConfiguration.objectUri?has_content>
@@ -26,10 +26,10 @@
     </#list>
     </select>
     
-    <input type="submit" id="offerCreate" class="submit"  value="Add a new item of this type" role="button" />  
+    <input type="submit" id="offerCreate" class="submit"  value="${i18n().add_new_of_type}" role="button" />  
     <#if rangeOptionsExist  = false >
-        <span class="or"> or </span>
-        <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+        <span class="or"> ${i18n().or} </span>
+        <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
     </#if>
 </form>          
 
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
index 9459b4d98..dd4f0978e 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultPropertyForm.ftl
@@ -25,12 +25,12 @@
             
             <p>
                 <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
-                <span class="or"> or </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <span class="or"> ${i18n().or} </span>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no entries in the system from which to select.  </p>  
+        <p> ${i18n().there_are_no_entries_for_selection}  </p>  
     </#if>
 </#if>
 
@@ -40,7 +40,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl
index 05e46f78e..5e0634fed 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement-remove.ftl
@@ -2,7 +2,7 @@
 
 <#--Template for removing menu items -->
 
-<h3>Remove menu item</h3>
+<h3>${i18n().remove_menu_item}</h3>
 
 <section id="remove-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="remove menu item">
@@ -10,9 +10,9 @@
         <input type="hidden" name="cmd" id="cmd" value="Remove" role="input" />
         <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
 
-        <p>Are you sure you want to remove <em>${menuName}</em> menu item?</p>
+        <p>${i18n().confirm_menu_item_delete} <em>${menuName}</em> ${i18n().menu_item}?</p>
 
-        <input type="submit" name="removeMenuItem" value="Remove menu item" class="submit" role="input" /> or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a>
+        <input type="submit" name="removeMenuItem" value="${i18n().remove_menu_item}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </form>
 </section>
 
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index e1aaec66f..7e93da003 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -11,11 +11,11 @@
     <#assign selectClassGroupStyle = " " />
 </#if>
 <section id="error-alert" role="alert" class="hidden">
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p></p>
 </section>
 
-<h3>${menuAction} menu item</h3>
+<h3>${menuAction} ${i18n().menu_item}</h3>
 
 <section id="${menuAction?lower_case}-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="${menuAction} menu item">
@@ -23,39 +23,39 @@
         <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" role="input" />
         <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
          
-        <label for="menu-name">Name<span class="requiredHint"> *</span></label>
+        <label for="menu-name">${i18n().name}<span class="requiredHint"> *</span></label>
         <input type="text" name="menuName" value="${menuName}" role="input" />
 
-        <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
+        <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
         <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
-        <p class="note">Must begin with a leading forward slash: / (e.g., /people)</p>
+        <p class="note">${i18n().start_with_leading_slash}</p>
         
-        <p>Template<span class="requiredHint"> *</span></p>
+        <p>${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
         
         <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked</#if> role="radio" />
-        <label class="inline" for="default"> Default</label>
+        <label class="inline" for="default"> ${i18n().default}</label>
         <br />
         <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
-        <label class="inline" for="custom"> Custom template</label>
+        <label class="inline" for="custom"> ${i18n().custom_template_mixed_caps}</label>
         
         <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
             <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>
         </section>
         
         <section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
-            <p>Selected content type for the associated page</p>
+            <p>${i18n().selected_page_content_type}</p>
             <p>
                 <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage}</span>
-                <a href="#" id="changeContentType" name="changeContentType" title="change content type">Change content type</a>
+                <a href="#" id="changeContentType" name="changeContentType" title="${i18n().change_content_type}">${i18n().change_content_type}</a>
             </p>
         </section>
         
         <#-- Select class group -->
         <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
-           <label for="selectClassGroup">Select content type for the associated page<span class="requiredHint"> *</span></label>
+           <label for="selectClassGroup">${i18n().select_page_content_type}<span class="requiredHint"> *</span></label>
            
            <select name="selectClassGroup" id="selectClassGroup" role="combobox">
-               <option value="-1" role="option">Select one</option>
+               <option value="-1" role="option">${i18n().select_one}</option>
                <#list classGroups as aClassGroup>
                     <option value="${aClassGroup.URI}" <#if aClassGroup.URI = associatedPageURI>selected</#if> role="option">${aClassGroup.publicName}</option>
                </#list>
@@ -64,7 +64,7 @@
         
         <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
             <#-- Select classes in a class group -->    
-            <p id="selectClassesMessage" name="selectClassesMessage">Select content to display<span class="requiredHint"> *</span></p>
+            <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
             
             <#include "menuManagement--classIntersections.ftl">
             
@@ -72,7 +72,7 @@
                 <#--Adding a default class for "ALL" in case all classes selected-->
                 <li class="ui-state-default" role="menuitem">
                     <input type="checkbox" name="allSelected" id="allSelected" value="all" <#if !isIndividualsForClassesPage?has_content>checked</#if> />
-                    <label class="inline" for="All"> All</label>
+                    <label class="inline" for="All"> ${i18n().all_capitalized}</label>
                 </li>
                 <#list classGroup as classInClassGroup>
                 <li class="ui-state-default" role="menuitem">
@@ -92,9 +92,9 @@
             </ul>
         </section>
         
-        <input type="submit" name="submit-${menuAction}" value="Save changes" class="submit" role="input" /> or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a>
+        <input type="submit" name="submit-${menuAction}" value="${i18n().save_changes}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
 
-        <p class="requiredHint">* required fields</p>
+        <p class="requiredHint">* ${i18n().required_fields}</p>
     </form>
 </section>
 
diff --git a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl
index bd53e0518..6522bd0ac 100644
--- a/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/newIndividualForm.ftl
@@ -11,15 +11,15 @@
 </#if>
 
 
-<h2>Create a new ${typeName}</h2>
+<h2>${i18n().create_new} ${typeName}</h2>
 
 <#if submissionErrors?has_content >
     <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
         <p>
         <#list submissionErrors?keys as errorFieldName>
         	<#if  errorFieldName == "label">
-        	    Please enter a value in the name field.
+        	    ${i18n().enter_value_name_field}
     	    </#if>
     	    <br />
     	</#list>
@@ -36,17 +36,17 @@
     <form id="newIndividual" class="customForm noIE67" action="${submitUrl}"  role="add new individual">
  
       <p>
-          <label for="name">Name ${requiredHint}</label>
+          <label for="name">${i18n().name} ${requiredHint}</label>
           <input size="30"  type="text" id="label" name="label" value="" />
       </p>
 
       <p class="submit">
           <input type="hidden" name = "editKey" value="${editKey}"/>
-          <input type="submit" id="submit" value="Create ${typeName}"/>
-          <span class="or"> or <a class="cancel" href="${urls.base}/siteAdmin" title="cancel">Cancel</a>
+          <input type="submit" id="submit" value="${i18n().create_capitalized} ${typeName}"/>
+          <span class="or"> or <a class="cancel" href="${urls.base}/siteAdmin" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
       </p>
 
-      <p id="requiredLegend" class="requiredHint">* required fields</p>
+      <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
 
     </form>
 
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
index f7ab08724..949d8e8cc 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
@@ -21,9 +21,9 @@
                        
                 <section id="selectContentType" name="selectContentType" ${selectClassGroupStyle} role="region">     
                     
-                    <label for="selectClassGroup">Class Group<span class="requiredHint"> *</span></label>
+                    <label for="selectClassGroup">${i18n().class_group_all_caps}<span class="requiredHint"> *</span></label>
                     <select name="selectClassGroup" id="selectClassGroup" role="combobox">
-                        <option value="-1" role="option">Select one</option>
+                        <option value="-1" role="option">${i18n().select_one}</option>
                         <#list classGroups as aClassGroup>
                             <option value="${aClassGroup.URI}"  role="option">${aClassGroup.publicName}</option>
                         </#list>
@@ -33,7 +33,7 @@
                 
                 <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
                     <#-- Select classes in a class group -->    
-                    <p id="selectClassesMessage" name="selectClassesMessage">Select content to display<span class="requiredHint"> *</span></p>
+                    <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
 
                     <#include "pageManagement--classIntersections.ftl">
 
@@ -41,7 +41,7 @@
                         <#--Adding a default class for "ALL" in case all classes selected-->
                         <li class="ui-state-default" role="menuitem">
                             <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" />
-                            <label class="inline" for="All"> All</label>
+                            <label class="inline" for="All"> ${i18n().all_capitalized}</label>
                         </li>
                         <#list classGroup as classInClassGroup>
                         <li class="ui-state-default" role="menuitem">
@@ -51,9 +51,9 @@
                         </li>
                         </#list>
                     </ul><br />
-                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
+                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
                     <#if menuAction == "Add">
-                        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+                        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
                     </#if>
                 </section>
             </section>
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
index 40a34192e..ecdbe82b9 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
@@ -2,13 +2,13 @@
 <#--This contains the template for the fixed HTML content type that is to be cloned and used in page management-->
 
 <section id="fixedHtml" class="contentSectionContainer">
-    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">Variable Name<span class="requiredHint"> *</span></label>
+    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
     <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
-    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">Enter fixed HTML here<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
+    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">${i18n().enter_fixed_html_here}<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
     <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" name="doneWithContent" value="Save this content" class="doneWithContent" />
+    <input  type="button" id="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" class="doneWithContent" />
     <#if menuAction == "Add">
-        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
     </#if>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
index c11a952b8..7ee1c75a7 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
@@ -1,16 +1,16 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 <#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
 <section id="sparqlQuery" class="contentSectionContainer">
-    <label id="variableLabel" for="variable">Variable Name<span class="requiredHint"> *</span></label>
+    <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
     <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
     <#--Hiding query model for now-->
-    <#-- <label id="queryModelLabel" for="queryModel">Query Model</label>  -->
+    <#-- <label id="queryModelLabel" for="queryModel">${i18n().query_model}</label>  -->
     <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
-    <label id="queryLabel" for="queryLabel"><span id="querySpan">Enter SPARQL query here</span><span class="requiredHint"> *</span></label>
+    <label id="queryLabel" for="queryLabel"><span id="querySpan">${i18n().enter_sparql_query_here}</span><span class="requiredHint"> *</span></label>
     <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="Save this content" />
+    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
     <#if menuAction == "Add">
-        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" >Cancel</a></span>
+        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
     </#if>
 </section>
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
index 44db6f6ac..32f1d76c8 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement.ftl
@@ -12,8 +12,8 @@
 <#assign menuLinkText = "" />
 <#assign menuPosition = pageData.highestMenuPosition />
 <#assign addMenuItem = "" />
-<#assign pageHeading = "Add New Page" />
-<#assign saveBtnText = "Save new page" />
+<#assign pageHeading = "${i18n().add_new_page}" />
+<#assign saveBtnText = "${i18n().save_new_page}" />
 <#if pageData.addMenuItem?has_content>
 	<#assign addMenuItem = pageData.addMenuItem />
 </#if>
@@ -27,8 +27,8 @@
 	<#assign menuLinkText =  lvf.getFormFieldValue(editSubmission, editConfiguration, "menuLinkText")/>
 	<#assign customTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "customTemplate")/>
 	<#assign selfContainedTemplate = lvf.getFormFieldValue(editSubmission, editConfiguration, "isSelfContainedTemplate")/>
-	<#assign pageHeading = "Edit ${pageName} Page" />
-    <#assign saveBtnText = "Save changes" />
+	<#assign pageHeading = "${i18n().edit_page(pageName)}" />
+    <#assign saveBtnText = "${i18n().save_changes}" />
 	<#if customTemplate?has_content>
 	    <#if selfContainedTemplate?has_content>
 		    <#assign selectedTemplateType = "selfContained" />
@@ -49,7 +49,7 @@
 
 <#------------HTML Portion------------->
 <section id="error-alert" role="alert" <#if !submissionErrors?has_content>class="hidden"</#if>>
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
     <p>
     <#if submissionErrors?has_content>
     	<#list submissionErrors?keys as errorFieldName>
@@ -70,13 +70,13 @@
     <section id="floatRight">
         <div id="rightSide" <#if selectedTemplateType="selfContained">style="display:none;"</#if>>
             <section id="addPageOne" role="region" >
-            <label for="contentType">Content Type<span class="requiredHint"> *</span></label> 
+            <label for="contentType">${i18n().content_type}<span class="requiredHint"> *</span></label> 
             <select id="typeSelect"  name="typeSelect" >
-                <option value="" selected="selected">Select a type</option>
-                <option value="browseClassGroup">Browse Class Group</option>           
-                <option value="fixedHtml">Fixed HTML</option>           
-                <option value="sparqlQuery">SPARQL Query Results</option>           
-             </select>&nbsp;<span class="note">Add one or more types</span>
+                <option value="" selected="selected">${i18n().select_type}</option>
+                <option value="browseClassGroup">${i18n().browse_class_group}</option>           
+                <option value="fixedHtml">${i18n().fixed_html}</option>           
+                <option value="sparqlQuery">${i18n().sparql_query_results}</option>           
+             </select>&nbsp;<span class="note">${i18n().add_types}</span>
             </section>
             <section id="contentDivs"></section>
             <section id="headerBar" >
@@ -91,27 +91,27 @@
     <!--Information for page or menu item level-->
     <div id="leftSide">
         <section id="pageDetails" role="region" >
-            <label for="page-name">Title<span class="requiredHint"> *</span></label>
+            <label for="page-name">${i18n().title_capitalized}<span class="requiredHint"> *</span></label>
             <input id="pageName" type="text" name="pageName" value="${pageName!''}" role="input" />
-            <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
+            <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label> 
             <input type="text" name="prettyUrl" value="${prettyUrl!''}" role="input" />
-            <p class="note">Must begin with a leading forward slash: / <br />(e.g., /people)</p>
-            <p id="templatePTag">Template<span class="requiredHint"> *</span></p>
+            <p class="note">${i18n().begin_with_slash_no_example} <br />${i18n().slash_example}</p>
+            <p id="templatePTag">${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
             <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked="checked"</#if> role="radio" />
-            <label class="inline" for="default"> Default</label>
+            <label class="inline" for="default"> ${i18n().default}</label>
             <br />
             <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> role="input" />
-            <label class="inline" for="custom"> Custom template requiring content</label>
+            <label class="inline" for="custom"> ${i18n().custom_template_requiring_content}</label>
             <br /><div id="selfContainedDiv">
             <input type="radio" name="selectedTemplate" class="selfContained-template" value="selfContained" <#if selectedTemplateType = "selfContained">checked="checked"</#if> role="input" />
-            <label class="inline" for="selfContained"> Custom template containing all content</label></div>
+            <label class="inline" for="selfContained"> ${i18n().custom_template_containing_content}</label></div>
             <section id="custom-template" <#if selectedTemplateType ="default">class="hidden" </#if>role="region">
                 <input type="text" name="customTemplate" value="${customTemplate!''}" size="33" role="input" /><span class="requiredHint"> *</span>
                 <input type="hidden" name="selfContainedTemplate" value="${selfContainedTemplate!''}"/>
             </section>
             <p id="menuCheckboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
             <#if (menuAction="Edit" && menuItem?has_content) || (menuAction="Add" && addMenuItem = "true")>checked="checked"</#if>
-            > This is a menu page</p>
+            > ${i18n().a_menu_page}</p>
             <section id="menu" role="region" 
             <#--Do not display menu section unless editing an existing menu item-->
             <#if (menuAction = "Add" && addMenuItem != "true")  || (menuAction="Edit" && (!menuItem?has_content || menuItem = "")) >
@@ -120,20 +120,20 @@
             class="showMenuSection"
             </#if>
             >
-                <label for="default">Menu Item Name</label>
+                <label for="default">${i18n().menu_item_name}</label>
                 <input type="hidden" id="menuItem" name="menuItem" value="${menuItem!''}" />
                 <input type="text" id="menuLinkText" name="menuLinkText" value="${menuLinkText!''}" size="28" role="input" />
                 <input type="hidden" id="menuPosition" name="menuPosition" value="${menuPosition!''}" />
-                <p class="note">If left blank, the page title will be used.</p>
+                <p class="note">${i18n().if_blank_page_title_used}</p>
             </section>
             <br />
         </section>
     </div>
     <section >
         <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span> 
-        <a class="cancel" href="${cancelUrl!}"  id="cancelPage" >Cancel</a>
+        <a class="cancel" href="${cancelUrl!}"  id="cancelPage" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         <br />
-        <p class="requiredHint">* required fields</p>
+        <p class="requiredHint">* ${i18n().required_fields}</p>
     </section>
     <!--Hidden input with JSON objects added will be included here.  This is the field with the page content information
     mirroring what is required by the Data getter server side objects. -->
diff --git a/webapp/web/templates/freemarker/edit/forms/rdfTypeForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfTypeForm.ftl
index 536c3004f..0b6589622 100644
--- a/webapp/web/templates/freemarker/edit/forms/rdfTypeForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/rdfTypeForm.ftl
@@ -22,12 +22,12 @@
             
             <p>
                 <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button "/>
-                <span class="or"> or </span>
-                <a title="Cancel" class="cancel" href="${cancelUrl}">Cancel</a>
+                <span class="or"> ${i18n().or} </span>
+                <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
             </p>
         </form>
     <#else>
-        <p> There are no Classes in the system from which to select.  </p>  
+        <p> ${i18n().no_classes_to_select}  </p>  
     </#if>
 
 <#if editConfiguration.propertyOfferCreateNewOption = true>
@@ -36,7 +36,7 @@
 </#if>
 
 <#if editConfiguration.propertySelectFromExisting = false && editConfiguration.propertyOfferCreateNewOption = false>
-<p>This property is currently configured to prohibit editing. </p>
+<p>${i18n().editing_prohibited} </p>
 </#if>
 
 <#if editConfiguration.includeDeletionForm = true>
diff --git a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
index 6095f9f98..feeb89d6d 100644
--- a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
@@ -1,12 +1,12 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#assign actionText = "Add new" />
+<#assign actionText = "${i18n().add_new}" />
 <#if editConfiguration.dataPropertyStatement?has_content>
-    <#assign actionText = "Edit"/>
+    <#assign actionText = "${i18n().edit_capitalized}"/>
 </#if>
-<#assign submitLabel>${actionText} label</#assign>
+<#assign submitLabel>${actionText} ${i18n().label}</#assign>
 
-<h2>${actionText} <em>label</em> for ${editConfiguration.subjectName}</h2>
+<h2>${actionText} <em>${i18n().label}</em> for ${editConfiguration.subjectName}</h2>
 
 <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
 
@@ -17,7 +17,7 @@
     
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="input"/>
-        or <a href="${cancelUrl}" class="cancel" title="cancel">Cancel</a>
+        or <a href="${cancelUrl}" class="cancel" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
     
 </form>
diff --git a/webapp/web/templates/freemarker/lib/lib-home-page.ftl b/webapp/web/templates/freemarker/lib/lib-home-page.ftl
index e184a1cac..1715cf108 100644
--- a/webapp/web/templates/freemarker/lib/lib-home-page.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-home-page.ftl
@@ -18,7 +18,7 @@
     <#assign selected = 'class="selected" ' />
     <#assign classGroupList>
         <section id="home-stats" class="home-sections" >
-            <h4>Statistics</h4>
+            <h4>${i18n().statistics}</h4>
             <ul id="stats">
                 <#assign groupCount = 1>
                 <#list classGroups as group>
@@ -31,6 +31,7 @@
                         <#if !firstPopulatedClassGroup??>
                             <#assign firstPopulatedClassGroup = group />
                         </#if>
+                        <#-- MAY BE NECESSARY FOR A SITE TO UPDATE THIS LINE BASED ON HOW IT CUSTOMIZES CLASS GROUP NAMES -->
                         <#if group.displayName != "equipment" && group.displayName != "courses" >
                             <li>
                                 <a href="#">
@@ -61,14 +62,14 @@
     <#if firstPopulatedClassGroup??>
             ${classGroupList}
     <#else>
-        <h3 id="noContentMsg">There is currently no content in the system, or you need to create class groups and assign your classes to them.</h3>
+        <h3 id="noContentMsg">${i18n().no_content_create_groups_classes}</h3>
         
         <#if user.loggedIn>
             <#if user.hasSiteAdminAccess>
-                <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+                <p>${i18n().you_can} <a href="${urls.siteAdmin}" title="${i18n().add_content_manage_site}">${i18n().add_content_manage_site}</a>${i18n().from_site_admin_page}</p>
             </#if>
         <#else>
-            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+            <p>${i18n().please} <a href="${urls.login}" title="${i18n().login_to_manage_site}">${i18n().log_in}</a> ${i18n().to_manage_content.}</p>
         </#if>
     </#if>
             
diff --git a/webapp/web/templates/freemarker/lib/lib-properties.ftl b/webapp/web/templates/freemarker/lib/lib-properties.ftl
index 8dd2bd355..7d360496a 100644
--- a/webapp/web/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-properties.ftl
@@ -115,11 +115,11 @@ name will be used as the label. -->
 
 <#macro showAddLink propertyLocalName label url>
     <#if propertyLocalName == "informationResourceInAuthorship" || propertyLocalName == "webpage" || propertyLocalName == "hasResearchArea">
-        <a class="add-${propertyLocalName}" href="${url}" title="Manage list of ${label?lower_case}">
-        <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="manage" /></a>
+        <a class="add-${propertyLocalName}" href="${url}" title="${i18n().manage_list_of} ${label?lower_case}">
+        <img class="add-individual" src="${urls.images}/individual/manage-icon.png" alt="${i18n().manage}" /></a>
     <#else>
-        <a class="add-${propertyLocalName}" href="${url}" title="Add new ${label?lower_case} entry">
-        <img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="add" /></a>
+        <a class="add-${propertyLocalName}" href="${url}" title="${i18n().add_new} ${label?lower_case} ${i18n().entry}">
+        <img class="add-individual" src="${urls.images}/individual/addIcon.gif" alt="${i18n().add}" /></a>
     </#if>
 </#macro>
 
@@ -151,7 +151,7 @@ name will be used as the label. -->
 </#macro>
 
 <#macro showEditLink propertyLocalName url>
-    <a class="edit-${propertyLocalName}" href="${url}" title="edit this entry"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="edit" /></a>
+    <a class="edit-${propertyLocalName}" href="${url}" title="${i18n().edit_entry}"><img class="edit-individual" src="${urls.images}/individual/editIcon.gif" alt="${i18n().edit_entry}" /></a>
 </#macro>
 
 <#macro deleteLink propertyLocalName statement> 
@@ -162,14 +162,14 @@ name will be used as the label. -->
 </#macro>
 
 <#macro showDeleteLink propertyLocalName url>
-    <a class="delete-${propertyLocalName}" href="${url}" title="delete this entry"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="delete" /></a>
+    <a class="delete-${propertyLocalName}" href="${url}" title="${i18n().delete_entry}"><img  class="delete-individual" src="${urls.images}/individual/deleteIcon.gif" alt="${i18n().delete_entry}" /></a>
 </#macro>
 
 <#macro verboseDisplay property>
     <#local verboseDisplay = property.verboseDisplay!>
     <#if verboseDisplay?has_content>       
         <section class="verbosePropertyListing">
-            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="name">${verboseDisplay.localName}</a> 
+            <a class="propertyLink" href="${verboseDisplay.propertyEditUrl}" title="${i18n().name}">${verboseDisplay.localName}</a> 
             (<span>${property.type?lower_case}</span> property);
             order in group: <span>${verboseDisplay.displayRank};</span> 
             display level: <span>${verboseDisplay.displayLevel};</span>
@@ -194,15 +194,15 @@ name will be used as the label. -->
     <#-- Don't assume that if the mainImage property is populated, there is a thumbnail image (though that is the general case).
          If there's a mainImage statement but no thumbnail image, treat it as if there is no image. -->
     <#if (mainImage.statements)?has_content && thumbUrl?has_content>
-        <a href="${individual.imageUrl}" title="individual photo">
-        	<img class="individual-photo" src="${thumbUrl}" title="click to view larger image" alt="${individual.name}" width="${imageWidth!}" />
+        <a href="${individual.imageUrl}" title="${i18n().alt_thumbnail_photo}">
+        	<img class="individual-photo" src="${thumbUrl}" title="${i18n().click_to_view_larger}" alt="${individual.name}" width="${imageWidth!}" />
         </a>
         <@editingLinks "${mainImage.localName}" mainImage.first() editable />
     <#else>
-        <#local imageLabel><@addLinkWithLabel mainImage editable "Photo" /></#local>
+        <#local imageLabel><@addLinkWithLabel mainImage editable "${i18n().photo}" /></#local>
         ${imageLabel}
         <#if showPlaceholder == "always" || (showPlaceholder="with_add_link" && imageLabel?has_content)>
-            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "no image" alt="placeholder image" width="${imageWidth!}" />
+            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "${i18n().no_image}" alt="${i18n().placeholder_image}" width="${imageWidth!}" />
         </#if>
     </#if>
 </#macro>
@@ -214,7 +214,7 @@ name will be used as the label. -->
     <#if (labelCount > 1)  && editable >
         <span class="inline">
             <a id="manageLabels" href="${urls.base}/manageLabels?subjectUri=${individual.uri!}">
-                manage labels
+                ${i18n().manage_labels}
             </a>
         </span>
     <#else>
diff --git a/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl b/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
index a330d3ca5..3a552afc2 100644
--- a/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
@@ -6,9 +6,8 @@
 <#macro unsupportedBrowser  urlsBase>
 <div id="ie67DisableWrapper">
     <div id="ie67DisableContent">
-	    <img src="${urlsBase}/images/iconAlertBig.png" alt="Alert Icon"/>
-	    <p>This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or
-	    switch to another browser, such as FireFox.</p>
+	    <img src="${urlsBase}/images/iconAlertBig.png" alt="${i18n().alert_icon}"/>
+	    <p>${i18n().unsupported_ie_version}</p>
     </div>
 </div>
 </#macro>
diff --git a/webapp/web/templates/freemarker/page/partials/copyright.ftl b/webapp/web/templates/freemarker/page/partials/copyright.ftl
index b0ca8758f..06b30d534 100644
--- a/webapp/web/templates/freemarker/page/partials/copyright.ftl
+++ b/webapp/web/templates/freemarker/page/partials/copyright.ftl
@@ -4,7 +4,7 @@
     <div class="copyright">
         &copy;${copyright.year?c}
         <#if copyright.url??>
-            <a href="${copyright.url}" title="copyright">${copyright.text}</a>
+            <a href="${copyright.url}" title="${i18n().copyright}">${copyright.text}</a>
         <#else>
             ${copyright.text}
         </#if>                 
diff --git a/webapp/web/templates/freemarker/page/partials/footer.ftl b/webapp/web/templates/freemarker/page/partials/footer.ftl
index 2da9f78ba..c88e4c186 100644
--- a/webapp/web/templates/freemarker/page/partials/footer.ftl
+++ b/webapp/web/templates/freemarker/page/partials/footer.ftl
@@ -18,7 +18,7 @@
 
     <#include "copyright.ftl">
 
-    All Rights Reserved. <a href="${urls.termsOfUse}" title="terms of use">Terms of Use</a>
+    ${i18n().all_rights_reserved} <a href="${urls.termsOfUse}" title="${i18n().terms_of_use}">${i18n().terms_of_use}</a>
 
     <#include "version.ftl">
 </div>
diff --git a/webapp/web/templates/freemarker/page/partials/identity.ftl b/webapp/web/templates/freemarker/page/partials/identity.ftl
index fc4cc49ca..20ded3f46 100644
--- a/webapp/web/templates/freemarker/page/partials/identity.ftl
+++ b/webapp/web/templates/freemarker/page/partials/identity.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <header id="branding" role="banner">
-    <h1 class="vivo-logo"><a href="${urls.home}" title="site name"><span class="displace">${siteName}</span></a></h1>
+    <h1 class="vivo-logo"><a href="${urls.home}" title="${siteName}"><span class="displace">${siteName}</span></a></h1>
     <#if siteTagline?has_content>
         <em>${siteTagline}</em>
     </#if>
@@ -11,31 +11,31 @@
             <#include "languageSelector.ftl">
             <#if user.loggedIn>
                 <li role="listitem">${user.loginName}</li>
-                <li role="listitem"><a href="${urls.logout}" title="End your session">Log out</a></li>
+                <li role="listitem"><a href="${urls.logout}" title="${i18n().end_your_Session}">${i18n().log_out}</a></li>
                 <#if user.hasSiteAdminAccess>
-                    <li role="listitem"><a href="${urls.siteAdmin}" title="Manage this site">Site Admin</a></li>
+                    <li role="listitem"><a href="${urls.siteAdmin}" title="${i18n().manage_site}">${i18n().site_admin}</a></li>
                 </#if>
             <#else>
-                <li role="listitem"><a href="${urls.login}" title="Log in to manage this site" >Log in</a></li>
+                <li role="listitem"><a href="${urls.login}" title="${i18n().login_to_manage_site}" >${i18n().login_button}</a></li>
             </#if>
             <#-- List of links that appear in submenus, like the header and footer. -->
-                <li role="listitem"><a href="${urls.about}" title="More details about this site">About</a></li>
+                <li role="listitem"><a href="${urls.about}" title="${i18n().more_details_about_site}">${i18n().about}</a></li>
             <#if urls.contact??>
-                <li role="listitem"><a href="${urls.contact}" title="Send us your feedback or ask a question">Contact Us</a></li>
+                <li role="listitem"><a href="${urls.contact}" title="${i18n().send_feedback_questions}">${i18n().contact_us}</a></li>
             </#if>
-                <li role="listitem"><a href="http://www.vivoweb.org/support" title="Visit the national project web site" target="blank">Support</a></li>
-                <li role="listitem"><a href="${urls.index}" title="View an outline of the content in this site">Index</a></li>
+                <li role="listitem"><a href="http://www.vivoweb.org/support" title="${i18n().visit_project_website}" target="blank">${i18n().support}</a></li>
+                <li role="listitem"><a href="${urls.index}" title="${i18n().view_content_index}">${i18n().index}</a></li>
         </ul>
     </nav>
     
     <section id="search" role="region">
         <fieldset>
-            <legend>Search form</legend>
+            <legend>${i18n().search_form}</legend>
             
             <form id="search-form" action="${urls.search}" name="search" role="search" accept-charset="UTF-8" method="POST"> 
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vitro" value="${querytext!}" autocapitalize="off" />
-                    <input type="submit" value="Search" class="submit">
+                    <input type="submit" value="${i18n().search_button}" class="submit">
                 </div>
             </form>
         </fieldset>
diff --git a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
index 2109f1912..991602284 100644
--- a/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
+++ b/webapp/web/templates/freemarker/page/partials/languageSelector.ftl
@@ -7,15 +7,14 @@
  -->
 
 <#-- This is included by identity.ftl --> 
-<#if selectLocale??>
-    <li>
-      <#list selectLocale.locales as locale>
-        <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}">
-          <img src="${locale.imageUrl}" height="15" align="middle" alt="${locale.label}"/>
-        </a>
-        <#if locale_has_next>|</#if>
-      </#list>
-    </li>
+<#if selectLocale??>    
+    <#list selectLocale.locales as locale>
+        <li>
+            <a href="${selectLocale.selectLocaleUrl}?selection=${locale.code}" title="${i18n().select_locale}">
+                <img src="${locale.imageUrl}" height="15" style="vertical-align:middle" alt="${locale.label}"/>
+            </a>
+        </li>
+    </#list>
 </#if>
 
 <#-- 
diff --git a/webapp/web/templates/freemarker/page/partials/menu.ftl b/webapp/web/templates/freemarker/page/partials/menu.ftl
index c5595ef95..e0543117e 100644
--- a/webapp/web/templates/freemarker/page/partials/menu.ftl
+++ b/webapp/web/templates/freemarker/page/partials/menu.ftl
@@ -3,7 +3,7 @@
 <nav role="navigation">
     <ul id="main-nav" role="list">
         <#list menu.items as item>
-            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="menu item">${item.linkText}</a></li>
+            <li role="listitem"><a href="${item.url}" <#if item.active> class="selected" </#if> title="${i18n().menu_item}">${item.linkText}</a></li>
         </#list>
     </ul>
 </nav>
diff --git a/webapp/web/templates/freemarker/page/partials/search.ftl b/webapp/web/templates/freemarker/page/partials/search.ftl
index e5d3e39b8..9e874a1a2 100644
--- a/webapp/web/templates/freemarker/page/partials/search.ftl
+++ b/webapp/web/templates/freemarker/page/partials/search.ftl
@@ -2,8 +2,8 @@
 
 <div id="searchBlock">
     <form id="searchForm" action="${urls.search}" accept-charset="UTF-8" method="POST">                    
-        <label for="search">Search </label>
+        <label for="search">${i18n().search_button}</label>
         <input type="text" name="querytext" id="search" class="search-form-item" value="${querytext!}" size="20" autocapitalize="off" />
-        <input class="search-form-submit" name="submit" type="submit"  value="Search" />
+        <input class="search-form-submit" name="submit" type="submit"  value="${i18n().search_button}" />
     </form>
 </div> <!-- end searchBlock -->
diff --git a/webapp/web/templates/freemarker/page/partials/subMenuLinks.ftl b/webapp/web/templates/freemarker/page/partials/subMenuLinks.ftl
index 639f802d0..a5be78501 100644
--- a/webapp/web/templates/freemarker/page/partials/subMenuLinks.ftl
+++ b/webapp/web/templates/freemarker/page/partials/subMenuLinks.ftl
@@ -6,5 +6,5 @@
 <#if urls.contact??>
     <li><a href="${urls.contact}">Contact Us</a></li>
 </#if> 
-<li><a href="http://www.vivoweb.org/support" title="support">Support</a></li>
-<li><a href="${urls.index}" title="index">Index</a></li>
\ No newline at end of file
+<li><a href="http://www.vivoweb.org/support" title="${i18n().support}">${i18n().support}</a></li>
+<li><a href="${urls.index}" title="${i18n().index}">${i18n().index}</a></li>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/page/partials/version.ftl b/webapp/web/templates/freemarker/page/partials/version.ftl
index 4a515e64f..25a3696e5 100644
--- a/webapp/web/templates/freemarker/page/partials/version.ftl
+++ b/webapp/web/templates/freemarker/page/partials/version.ftl
@@ -5,6 +5,6 @@
 <#-- Only show version info if user has access -->
 <#if user.hasRevisionInfoAccess>
     <div id="revision">
-        Version <a href="${version.moreInfoUrl}" title="version">${version.label}</a>
+        ${i18n().version} <a href="${version.moreInfoUrl}" title="${i18n().version}">${version.label}</a>
     </div>
 </#if>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/widgets/widget-browse.ftl b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
index e99388fe9..28ef5f8da 100644
--- a/webapp/web/templates/freemarker/widgets/widget-browse.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
@@ -12,12 +12,12 @@
 
 <#macro allClassGroups>
     <section id="browse" role="region">
-        <h4>Browse</h4>
+        <h4>${i18n().browse_capitalized}</h4>
         
         <ul id="browse-classgroups" role="list">
         <#list vclassGroupList as group>
             <#if (group.individualCount > 0)>
-                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="group name">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}" title="${i18n().group_name}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
         </ul>
@@ -28,14 +28,14 @@
 
 <#macro classGroup>
     <section id="browse" role="region">
-        <h4>Browse</h4>
+        <h4>${i18n().browse_capitalized}</h4>
         
          <section id="browse-classes" role="navigation">
              <nav>
                  <ul id="classes-in-classgroup" role="list">
                      <#list classes as class>
                         <#if (class.individualCount > 0)>
-                            <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="class name">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
+                            <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}" title="${i18n().class_name}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
                         </#if>
                      </#list>
                  </ul>
@@ -46,7 +46,7 @@
 
 <#macro vclass>
     <section id="browse" role="region">
-    <h4>Browse</h4>    
+    <h4>${i18n().browse_capitalized}</h4>    
         <div>
             vclass ${class.name} from ${classGroup.displayName}
             This has classGroup, classes, individualsInClass and class.
@@ -54,14 +54,14 @@
          
         <ul>
             <#list individualsInClass as ind>
-                <li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="individual name">${ind.name}</a></li>
+                <li><a href="${urls.base}/individual?uri=${ind.uri?url}" title="${i18n().individual_nam}">${ind.name}</a></li>
             </#list>
         </section>
 </#macro>
 
 <#macro vclassAlpha>
     <section id="browse" role="region">
-    <h4>Browse</h4>     
-        <div>vclassAlpha is not yet implemented.</div> 
+    <h4>${i18n().browse_capitalized}</h4>     
+        <div>${i18n().vclassAlpha_not_implemented}</div> 
     </section>
 </#macro>
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 97cc617c5..c08d2215b 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -22,14 +22,14 @@
     <#if currentServlet != 'home'>
         <noscript>
             <section id="error-alert">
-                <img src="${urls.images}/iconAlertBig.png" alt="Alert Icon"/>
-                <p>In order to edit content, you'll need to enable JavaScript. Here are the <a href="http://www.enable-javascript.com" title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
+                <img src="${urls.images}/iconAlertBig.png" alt="${i18n().alert_icon}"/>
+                <p>${i18n().javascript_require_to_edit} <a href="http://www.enable-javascript.com" title="${i18n().javascript_instructions}">${i18n().to_enable_javascript}</a>.</p>
             </section>
         </noscript>
     </#if>
 
     <section id="login" class="hidden">
-        <h2>Log in</h2>
+        <h2>${i18n().login_button}</h2>
     
         <#if infoMessage??>
             <h3>${infoMessage}</h3>
@@ -38,7 +38,7 @@
         <#if errorMessage??>
             <#assign infoClassShow = ' id="vivoAccountError"'/>
         
-            <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alert="Error alert icon" />
+            <section id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" alt="${i18n().error_alert_icon}" />
                 <p class="login-alert">${errorMessage}</p>
             </section>
         </#if>
@@ -47,29 +47,29 @@
             <#if externalAuthUrl??>
                 <#assign infoClassHide = 'class="vivoAccount"'/>
             
-                <p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="external authentication name">${externalAuthName}</a></p>
+                <p class="external-auth"><a class="blue button" href="${externalAuthUrl}" title="${i18n().external_auth_name}">${externalAuthName}</a></p>
                 <!--<p class="or-auth">or</p>-->
-                <h3 class="internal-auth"><!--Log in using your--> <b>or</b> ${siteName} account</h3>
+                <h3 class="internal-auth"><!--Log in using your--> <b>${i18n().or}</b> ${siteName} ${i18n().account}</h3>
                 
             </#if>
             
             <div ${infoClassHide} ${infoClassShow}>
             
-                <label for="loginName">Email</label>
+                <label for="loginName">${i18n().email_capitalized}</label>
                 <input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
 
-                <label for="loginPassword">Password</label>
+                <label for="loginPassword">${i18n().password_capitalized}</label>
                 <input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
           
-                <p class="submit"><input name="loginForm" class="green button" type="submit" value="Log in"/></p>
+                <p class="submit"><input name="loginForm" class="green button" type="submit" value="${i18n().login_button}"/></p>
           
                 <#-- NC: remember me won't be ready for r1.2
                 <input class="checkbox-remember-me" name="remember-me" type="checkbox" value="" />  
                 <label class="label-remember-me" for="remember-me">Remember me</label> -->
                 <#-- mb863: forgot password and request an account won't be part of VIVO r1.2
                 <p class="forgot-password"><a href="#" title="forgot password">Forgot your password?</a></p>
-                <p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p> -->
-            
+                <p class="request-account"><a class="blue button" href="#" title="request an account">Request an account</a> </p>
+                -->
             </div>
         </form>
 
@@ -78,33 +78,33 @@
 
 <#macro forcePasswordChange>
     <section id="login">
-        <h2>Change Password to Log in</h2>
+        <h2>${i18n().change_password_to_login}</h2>
            
             <#if errorMessage??>
-                <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
+                <div id="error-alert" role="alert"><img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}"/>
                     <p>${errorMessage}</p>
                 </div>
             </#if>
            
             <form role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
-                <label for="newPassword">New Password</label>
+                <label for="newPassword">${i18n().new_password_capitalized}</label>
                 <input id="newPassword" name="newPassword" class="text-field focus" type="password" required autofocus/>
                 
-                <p class="password-note">Minimum of 6 characters in length.</p>
+                <p class="password-note">${i18n().minimum_six_chars}</p>
                 
-                <label for="confirmPassword">Confirm Password</label>
+                <label for="confirmPassword">${i18n().confirm_password_capitalized}</label>
                 <input id="confirmPassword" name="confirmPassword" class="text-field" type="password" required />
                 
-                 <p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="Log in"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="cancel">Cancel</a></span></p>
+                 <p class="submit-password"><input name="passwordChangeForm" class="green button" type="submit" value="${i18n().login_button}"/> <span class="or">or <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span></p>
             </form>
     </section>
 </#macro>
 
 <#macro alreadyLoggedIn>
-    <h2>Log in</h2>
-    <p>You are already logged in.</p>
+    <h2>${i18n().login_button}</h2>
+    <p>${i18n().already_logged_in}</p>
 </#macro>
 
 <#macro error>
-    <p>There was an error in the system.</p>
+    <p>${i18n().we_have_an_error}</p>
 </#macro>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/widgets/widget-test.ftl b/webapp/web/templates/freemarker/widgets/widget-test.ftl
index 6d21f844c..bfae7b4d5 100644
--- a/webapp/web/templates/freemarker/widgets/widget-test.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-test.ftl
@@ -10,14 +10,14 @@
 
 <#macro loggedIn>
     <div class="testWidget">
-        <h4>This is the test widget for logged-in users.</h4>    
-        <p>Login status: ${status}.</p>
+        <h4>${i18n().test_for_logged_in_users}</h4>    
+        <p>${i18n().login_status} ${status}.</p>
     </div>
 </#macro>
 
 <#macro notLoggedIn>
     <div class="testWidget">
-        <h4>This is the test widget for non-logged-in users.</h4>    
-        <p>Login status: ${status}.</p>
+        <h4>${i18n().test_for_nonlogged_in_users}</h4>    
+        <p>${i18n().login_status} ${status}.</p>
     </div>
 </#macro>
\ No newline at end of file