diff --git a/src/components/HOCs/WithTaskFeatureProperties/WithTaskFeatureProperties.js b/src/components/HOCs/WithTaskFeatureProperties/WithTaskFeatureProperties.js
new file mode 100644
index 000000000..9b9e78e57
--- /dev/null
+++ b/src/components/HOCs/WithTaskFeatureProperties/WithTaskFeatureProperties.js
@@ -0,0 +1,15 @@
+import React from 'react'
+import useMRProperties from '../../../hooks/UseMRProperties/UseMRProperties'
+import AsMappableTask from '../../../interactions/Task/AsMappableTask'
+
+const WithTaskFeatureProperties = (Component) => {
+  return function(props) {
+    const allFeatureProperties = AsMappableTask(props.task).allFeatureProperties()
+    const mrProperties = useMRProperties(props.workspaceContext)
+    const allProperties = Object.assign({}, mrProperties, allFeatureProperties)
+    
+    return (<Component {...props} taskFeatureProperties={allProperties}/>)
+  }
+}
+
+export default WithTaskFeatureProperties
\ No newline at end of file