diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml
new file mode 100644
index 0000000000..6d1deaeabb
--- /dev/null
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+    
+    <!--  Public Capabilities -->
+
+    <bean id="rmExtendRetentionPeriodOrFreezeCapability"  
+    	  parent="declarativeCapability">
+   		<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
+   		<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>   	 		
+		<property name="kinds">
+			<list>
+				<value>RECORD_FOLDER</value>
+				<value>RECORD</value>
+			</list>
+		</property>		
+   		<property name="conditions">
+   			<map>
+   				<entry key="capabilityCondition.filling" value="true"/>
+   				<entry key="capabilityCondition.frozen" value="false"/>   				
+   			</map>
+   		</property>
+    </bean>  
+    
+    <bean id="rmUnfreezeCapability" 
+    	  parent="declarativeCapability">
+   		<property name="name" value="Unfreeze"/>
+   		<property name="permission" value="Unfreeze"/>   		
+   		<property name="conditions">
+   			<map>
+   				<entry key="capabilityCondition.filling" value="true"/>
+   				<entry key="capabilityCondition.frozenOrHold" value="true"/>
+   			</map>
+   		</property>
+    </bean>
+    
+    <bean id="rmViewUpdateReasonsForFreezeCapability" 
+    	  parent="declarativeCapability">
+   		<property name="name" value="ViewUpdateReasonsForFreeze"/>
+   		<property name="permission" value="ViewUpdateReasonsForFreeze"/>   		
+   		<property name="conditions">
+   			<map>
+   				<entry key="capabilityCondition.frozenOrHold" value="true"/>
+   			</map>
+   		</property>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
index 9e35327850..8b06e20f26 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
@@ -103,6 +103,17 @@
             </list>
         </property>
     </bean>
-    	
+    
+    <bean id="rmCopy"
+          parent="declarativeCapability">
+    	<property name="name" value="Copy"/>
+    	<property name="private" value="true"/>
+    	<property name="conditions">
+    		<map>
+    			<entry key="capabilityCondition.frozen" value="false"/>
+    		</map>
+    	</property>
+    	<property name="targetCapability" ref="rmCreate" />
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index 1f3745a0da..9aa0c39881 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -72,6 +72,18 @@
 			</list>
 		</property>	
 	</bean>
+	
+	<bean id="rmFileToRecordsCapability"
+	      parent="declarativeCapability">
+		<property name="name" value="FileToRecords"/>
+		<property name="private" value="true" />		
+    	<property name="conditions">
+    		<map>
+    			<entry key="capabilityCondition.frozen" value="false"/>
+    		</map>
+    	</property>
+    	<property name="targetCapability" ref="rmFileRecordsCapability" />
+	</bean>
 
     <bean id="rmDeclareRecordsCapability" 
     	  parent="declarativeCapability">
@@ -172,13 +184,14 @@
    			<map>
    				<entry key="capabilityCondition.filling" value="true"/>
    				<entry key="capabilityCondition.cutoff" value="false"/>
-   				<entry key="capabilityCondition.frozen" value="false"/>   				
-   				<entry key="capabilityCondition.closed" value="false"/>   				   				
+   				<entry key="capabilityCondition.frozen" value="false"/>   				  				   				
    				<entry key="capabilityCondition.declared" value="true"/>
    			</map>
    		</property>
     </bean>    
     
+    <!--  TODO .. this is being used for the wrong thing! ... should indicate that the use can edit the non-record meta-data of a record -->
+    <!--  TODO .. may need some kind of 'prep' record capability you get with file? .. I think this is what this is being used for atm -->
     <bean id="rmEditNonRecordMetadataCapability" 
     	  parent="declarativeCapability"
           class="org.alfresco.module.org_alfresco_module_rm.capability.impl.EditCapability">
@@ -186,7 +199,8 @@
    		<property name="permission" value="EditNonRecordMetadata"/>   		
    		<property name="conditions">
    			<map>
-   				<entry key="capabilityCondition.fileable" value="true"/>   				   				
+   				<entry key="capabilityCondition.fileable" value="true"/>   				
+   				<entry key="capabilityCondition.frozen" value="false"/>   				   				
    			</map>
    		</property>
     </bean> 
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index 78557fb501..303ce83a22 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -266,25 +266,7 @@
 		  parent="declarativeCapability">
 		<property name="name" value="ExportAudit" />
 		<property name="permission" value="ExportAudit" />
-	</bean>
-
-    <bean id="rmExtendRetentionPeriodOrFreezeCapability"  
-    	  parent="declarativeCapability">
-   		<property name="name" value="ExtendRetentionPeriodOrFreeze"/>
-   		<property name="permission" value="ExtendRetentionPeriodOrFreeze"/>   	 		
-		<property name="kinds">
-			<list>
-				<value>RECORD_FOLDER</value>
-				<value>RECORD</value>
-			</list>
-		</property>		
-   		<property name="conditions">
-   			<map>
-   				<entry key="capabilityCondition.filling" value="true"/>
-   				<entry key="capabilityCondition.frozen" value="false"/>   				
-   			</map>
-   		</property>
-    </bean>    
+	</bean>    
     
     <bean id="rmMakeOptionalPropertiesMandatoryCapability" 
 		  parent="declarativeCapability">
@@ -397,18 +379,6 @@
    		</property>
     </bean>    
     
-    <bean id="rmUnfreezeCapability" 
-    	  parent="declarativeCapability">
-   		<property name="name" value="Unfreeze"/>
-   		<property name="permission" value="Unfreeze"/>   		
-   		<property name="conditions">
-   			<map>
-   				<entry key="capabilityCondition.filling" value="true"/>
-   				<entry key="capabilityCondition.frozenOrHold" value="true"/>
-   			</map>
-   		</property>
-    </bean>
-    
     <bean id="rmUpdateClassificationDatesCapability" 
 		  parent="declarativeCapability">
 		<property name="name" value="UpdateClassificationDates" />
@@ -443,22 +413,14 @@
    		</property>
     </bean>
     
-    <bean id="rmViewUpdateReasonsForFreezeCapability" 
-    	  parent="declarativeCapability">
-   		<property name="name" value="ViewUpdateReasonsForFreeze"/>
-   		<property name="permission" value="ViewUpdateReasonsForFreeze"/>   		
-   		<property name="conditions">
-   			<map>
-   				<entry key="capabilityCondition.frozenOrHold" value="true"/>
-   			</map>
-   		</property>
-    </bean>
-    
     <!-- Record Folder capabilities -->
     <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml"/>
     
     <!-- Record capabilities -->
-    <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml"/>
+    <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml"/>    
+    
+    <!-- Freeze capabilities -->
+    <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-freeze-context.xml"/>
     
     <!-- Group capabilities -->
     <import resource="classpath:alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml"/>  
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index a0b5da046c..36052ca0a8 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -227,7 +227,7 @@
 				<value>RECORD</value>
 			</set>
 		</property>	
-		<!-- <property name="capability" value="Delete"/> -->      
+		<property name="capability" value="Copy"/>
 	</bean>
 	
 	<bean id="jsonConversionComponent.moveRecordAction"
@@ -271,6 +271,7 @@
 				<value>RECORD</value>
 			</set>
 		</property>
+		<property name="capability" value="FileToRecords" />
 	</bean>
 	
 	<bean id="jsonConversionComponent.file"