diff --git a/SpeckleLib/Speckle/Record/Property/Value.cpp b/SpeckleLib/Speckle/Record/Property/Value.cpp
index 9757d9d..6c52edf 100644
--- a/SpeckleLib/Speckle/Record/Property/Value.cpp
+++ b/SpeckleLib/Speckle/Record/Property/Value.cpp
@@ -37,29 +37,39 @@ namespace {
 		switch (source.type) {
 			case API_PropertyIntegerValueType:
 				result = std::make_unique<active::setting::Int64Value>(source.intValue);
+				break;
 			case API_PropertyRealValueType: {
 					//Ensure measured values are an appropriate type
 				switch (measure) {
 					case API_PropertyLengthMeasureType:
 						result = std::make_unique<active::setting::LengthValue>(source.doubleValue);
+						break;
 					case API_PropertyAreaMeasureType:
 						result = std::make_unique<active::setting::AreaValue>(source.doubleValue);
+						break;
 					case API_PropertyVolumeMeasureType:
 						result = std::make_unique<active::setting::VolumeValue>(source.doubleValue);
+						break;
 					case API_PropertyAngleMeasureType:
 						result = std::make_unique<active::setting::AngleValue>(source.doubleValue);
+						break;
 					default:
 						result = std::make_unique<active::setting::DoubleValue>(source.doubleValue);
+						break;
 				}
 			}
 			case API_PropertyStringValueType:
 				result = std::make_unique<active::setting::StringValue>(String{source.uniStringValue});
+				break;
 			case API_PropertyBooleanValueType:
 				result = std::make_unique<active::setting::BoolValue>(source.boolValue);
+				break;
 			case API_PropertyGuidValueType:
 				result = std::make_unique<active::setting::GuidValue>(Guid{source.guidValue});
+				break;
 			default:
 				result = std::make_unique<active::setting::NullValue>();	//TODO: Is this a possible/valid outcome?
+				break;
 		}
 			//If the value hasn't already been established as bad, apply the source status
 		if (result->status != active::setting::Value::bad) {
diff --git a/SpeckleLib/SpeckleLib17.vcxproj b/SpeckleLib/SpeckleLib17.vcxproj
index 91e0bab..d49baa3 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj
+++ b/SpeckleLib/SpeckleLib17.vcxproj
@@ -22,6 +22,7 @@
     <ClInclude Include="Speckle\Database\AccountDatabase.h" />
     <ClInclude Include="Speckle\Database\BIMAttributeDatabase.h" />
     <ClInclude Include="Speckle\Database\BIMElementDatabase.h" />
+    <ClInclude Include="Speckle\Database\BIMGroupDatabase.h" />
     <ClInclude Include="Speckle\Database\BIMPropertyDatabase.h" />
     <ClInclude Include="Speckle\Database\Content\BIMRecord.h" />
     <ClInclude Include="Speckle\Database\Content\Record.h" />
@@ -33,6 +34,7 @@
     <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\ArchicadDBaseCore.h" />
     <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Attribute\ArchicadAttributeDBaseEngine.h" />
     <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Element\ArchicadElementDBaseEngine.h" />
+    <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadGroupDBaseEngine.h" />
     <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadPropertyDBaseEngine.h" />
     <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.h" />
     <ClInclude Include="Speckle\Database\Storage\DocumentStore\DocumentStoreEngine.h" />
@@ -86,6 +88,7 @@
     <ClInclude Include="Speckle\Record\Element\Interface\SegmentedColumn.h" />
     <ClInclude Include="Speckle\Record\Element\Memo.h" />
     <ClInclude Include="Speckle\Record\Element\ModelElement.h" />
+    <ClInclude Include="Speckle\Record\Property\Group.h" />
     <ClInclude Include="Speckle\Record\Property\Propertied.h" />
     <ClInclude Include="Speckle\Record\Property\Property.h" />
     <ClInclude Include="Speckle\Record\Property\Setting.h" />
@@ -117,6 +120,7 @@
     <ClCompile Include="Speckle\Database\AccountDatabase.cpp" />
     <ClCompile Include="Speckle\Database\BIMAttributeDatabase.cpp" />
     <ClCompile Include="Speckle\Database\BIMElementDatabase.cpp" />
+    <ClCompile Include="Speckle\Database\BIMGroupDatabase.cpp" />
     <ClCompile Include="Speckle\Database\BIMPropertyDatabase.cpp" />
     <ClCompile Include="Speckle\Database\Content\BIMRecord.cpp" />
     <ClCompile Include="Speckle\Database\Content\Record.cpp" />
@@ -124,6 +128,7 @@
     <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\ArchicadDBaseCore.cpp" />
     <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Attribute\ArchicadAttributeDBaseEngine.cpp" />
     <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Element\ArchicadElementDBaseEngine.cpp" />
+    <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadGroupDBaseEngine.cpp" />
     <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadPropertyDBaseEngine.cpp" />
     <ClCompile Include="Speckle\Database\Storage\DocumentStore\DocumentStoreCore.cpp" />
     <ClCompile Include="Speckle\Environment\Addon.cpp" />
@@ -162,6 +167,7 @@
     <ClCompile Include="Speckle\Record\Element\Interface\SegmentedColumn.cpp" />
     <ClCompile Include="Speckle\Record\Element\Memo.cpp" />
     <ClCompile Include="Speckle\Record\Element\ModelElement.cpp" />
+    <ClCompile Include="Speckle\Record\Property\Group.cpp" />
     <ClCompile Include="Speckle\Record\Property\Propertied.cpp" />
     <ClCompile Include="Speckle\Record\Property\Property.cpp" />
     <ClCompile Include="Speckle\Record\Property\Setting.cpp" />
diff --git a/SpeckleLib/SpeckleLib17.vcxproj.filters b/SpeckleLib/SpeckleLib17.vcxproj.filters
index 604c09c..d285087 100644
--- a/SpeckleLib/SpeckleLib17.vcxproj.filters
+++ b/SpeckleLib/SpeckleLib17.vcxproj.filters
@@ -397,6 +397,15 @@
     <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadPropertyDBaseEngine.h">
       <Filter>Speckle\Database\Storage\ArchicadDBase\Property</Filter>
     </ClInclude>
+    <ClInclude Include="Speckle\Database\BIMGroupDatabase.h">
+      <Filter>Speckle\Database</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadGroupDBaseEngine.h">
+      <Filter>Speckle\Database\Storage\ArchicadDBase\Property</Filter>
+    </ClInclude>
+    <ClInclude Include="Speckle\Record\Property\Group.h">
+      <Filter>Speckle\Record\Property</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Speckle\Environment\Addon.cpp">
@@ -594,6 +603,15 @@
     <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadPropertyDBaseEngine.cpp">
       <Filter>Speckle\Database\Storage\ArchicadDBase\Property</Filter>
     </ClCompile>
+    <ClCompile Include="Speckle\Database\BIMGroupDatabase.cpp">
+      <Filter>Speckle\Database</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Database\Storage\ArchicadDBase\Property\ArchicadGroupDBaseEngine.cpp">
+      <Filter>Speckle\Database\Storage\ArchicadDBase\Property</Filter>
+    </ClCompile>
+    <ClCompile Include="Speckle\Record\Property\Group.cpp">
+      <Filter>Speckle\Record\Property</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="Speckle\CMakeLists.txt">