diff --git a/force-app/main/default/dashboards/AnimalShelterDashboards.dashboardFolder-meta.xml b/force-app/main/default/dashboards/AnimalShelterDashboards.dashboardFolder-meta.xml
new file mode 100644
index 00000000..aa2a5935
--- /dev/null
+++ b/force-app/main/default/dashboards/AnimalShelterDashboards.dashboardFolder-meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DashboardFolder xmlns="http://soap.sforce.com/2006/04/metadata">
+    <folderShares>
+        <accessLevel>Manage</accessLevel>
+        <sharedTo>test-tpvqkbctykbo@example.com</sharedTo>
+        <sharedToType>User</sharedToType>
+    </folderShares>
+    <name>Animal Shelter Dashboards</name>
+</DashboardFolder>
diff --git a/force-app/main/default/dashboards/AnimalShelterDashboards/dklAwhHHpHBzWUoGiQclJudQrVYlhU.dashboard-meta.xml b/force-app/main/default/dashboards/AnimalShelterDashboards/dklAwhHHpHBzWUoGiQclJudQrVYlhU.dashboard-meta.xml
new file mode 100644
index 00000000..245ef423
--- /dev/null
+++ b/force-app/main/default/dashboards/AnimalShelterDashboards/dklAwhHHpHBzWUoGiQclJudQrVYlhU.dashboard-meta.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Dashboard xmlns="http://soap.sforce.com/2006/04/metadata">
+    <backgroundEndColor>#FFFFFF</backgroundEndColor>
+    <backgroundFadeDirection>Diagonal</backgroundFadeDirection>
+    <backgroundStartColor>#FFFFFF</backgroundStartColor>
+    <chartTheme>light</chartTheme>
+    <colorPalette>unity</colorPalette>
+    <dashboardChartTheme>light</dashboardChartTheme>
+    <dashboardColorPalette>unity</dashboardColorPalette>
+    <dashboardGridLayout>
+        <dashboardGridComponents>
+            <colSpan>3</colSpan>
+            <columnIndex>0</columnIndex>
+            <dashboardComponent>
+                <autoselectColumnsFromReport>false</autoselectColumnsFromReport>
+                <chartAxisRange>Auto</chartAxisRange>
+                <chartSummary>
+                    <axisBinding>y</axisBinding>
+                    <column>RowCount</column>
+                </chartSummary>
+                <componentType>Donut</componentType>
+                <decimalPrecision>-1</decimalPrecision>
+                <displayUnits>Auto</displayUnits>
+                <drillEnabled>false</drillEnabled>
+                <drillToDetailEnabled>false</drillToDetailEnabled>
+                <enableHover>false</enableHover>
+                <expandOthers>false</expandOthers>
+                <groupingColumn>Animal__c.Animal_Status__c</groupingColumn>
+                <groupingSortProperties>
+                    <groupingSorts>
+                        <groupingLevel>g1</groupingLevel>
+                        <sortOrder>a</sortOrder>
+                    </groupingSorts>
+                </groupingSortProperties>
+                <header>Animals by Status</header>
+                <legendPosition>Right</legendPosition>
+                <maxValuesDisplayed>6</maxValuesDisplayed>
+                <report>AnimalShelterReports/Animals_by_Status_CMa</report>
+                <showPercentage>false</showPercentage>
+                <showTotal>true</showTotal>
+                <showValues>true</showValues>
+                <sortBy>RowLabelAscending</sortBy>
+                <useReportChart>false</useReportChart>
+            </dashboardComponent>
+            <rowIndex>0</rowIndex>
+            <rowSpan>8</rowSpan>
+        </dashboardGridComponents>
+        <dashboardGridComponents>
+            <colSpan>3</colSpan>
+            <columnIndex>3</columnIndex>
+            <dashboardComponent>
+                <autoselectColumnsFromReport>false</autoselectColumnsFromReport>
+                <chartAxisRange>Auto</chartAxisRange>
+                <chartSummary>
+                    <aggregate>Sum</aggregate>
+                    <axisBinding>y</axisBinding>
+                    <column>Locations__c.Capacity__c</column>
+                </chartSummary>
+                <componentType>Donut</componentType>
+                <decimalPrecision>-1</decimalPrecision>
+                <displayUnits>Auto</displayUnits>
+                <drillEnabled>false</drillEnabled>
+                <drillToDetailEnabled>false</drillToDetailEnabled>
+                <enableHover>false</enableHover>
+                <expandOthers>false</expandOthers>
+                <groupingColumn>Locations__c.Parent_Block_Name__c</groupingColumn>
+                <groupingSortProperties>
+                    <groupingSorts>
+                        <groupingLevel>g1</groupingLevel>
+                        <sortOrder>a</sortOrder>
+                    </groupingSorts>
+                </groupingSortProperties>
+                <header>Available Capacity</header>
+                <legendPosition>Right</legendPosition>
+                <maxValuesDisplayed>6</maxValuesDisplayed>
+                <report>AnimalShelterReports/Locations_All_Available_Locations_qYH</report>
+                <showPercentage>false</showPercentage>
+                <showTotal>false</showTotal>
+                <showValues>true</showValues>
+                <sortBy>RowLabelAscending</sortBy>
+                <title>By Block</title>
+                <useReportChart>false</useReportChart>
+            </dashboardComponent>
+            <rowIndex>0</rowIndex>
+            <rowSpan>8</rowSpan>
+        </dashboardGridComponents>
+        <dashboardGridComponents>
+            <colSpan>3</colSpan>
+            <columnIndex>6</columnIndex>
+            <dashboardComponent>
+                <autoselectColumnsFromReport>false</autoselectColumnsFromReport>
+                <chartAxisRange>Auto</chartAxisRange>
+                <chartSummary>
+                    <aggregate>Sum</aggregate>
+                    <axisBinding>y</axisBinding>
+                    <column>Adoption_Match__c.Successful_Adoption__c</column>
+                </chartSummary>
+                <componentType>Donut</componentType>
+                <decimalPrecision>-1</decimalPrecision>
+                <displayUnits>Auto</displayUnits>
+                <drillEnabled>false</drillEnabled>
+                <drillToDetailEnabled>false</drillToDetailEnabled>
+                <enableHover>false</enableHover>
+                <expandOthers>false</expandOthers>
+                <groupingColumn>Adoption_Match__c.Status__c</groupingColumn>
+                <groupingSortProperties>
+                    <groupingSorts>
+                        <groupingLevel>g1</groupingLevel>
+                        <sortOrder>a</sortOrder>
+                    </groupingSorts>
+                </groupingSortProperties>
+                <header>Successful Adoptions</header>
+                <legendPosition>Right</legendPosition>
+                <maxValuesDisplayed>6</maxValuesDisplayed>
+                <report>AnimalShelterReports/Successful_Adoptions_by_Match_Type_S85</report>
+                <showPercentage>false</showPercentage>
+                <showTotal>true</showTotal>
+                <showValues>true</showValues>
+                <sortBy>RowLabelAscending</sortBy>
+                <title>By Match Type</title>
+                <useReportChart>false</useReportChart>
+            </dashboardComponent>
+            <rowIndex>0</rowIndex>
+            <rowSpan>8</rowSpan>
+        </dashboardGridComponents>
+        <dashboardGridComponents>
+            <colSpan>6</colSpan>
+            <columnIndex>0</columnIndex>
+            <dashboardComponent>
+                <autoselectColumnsFromReport>false</autoselectColumnsFromReport>
+                <componentType>FlexTable</componentType>
+                <flexComponentProperties>
+                    <decimalPrecision>-1</decimalPrecision>
+                    <flexTableColumn>
+                        <reportColumn>FK_Animal__c.Animal_Name__c</reportColumn>
+                        <showSubTotal>false</showSubTotal>
+                        <showTotal>false</showTotal>
+                        <type>detail</type>
+                    </flexTableColumn>
+                    <flexTableColumn>
+                        <reportColumn>Animal_Action__c.Description__c</reportColumn>
+                        <showSubTotal>false</showSubTotal>
+                        <showTotal>false</showTotal>
+                        <type>detail</type>
+                    </flexTableColumn>
+                    <flexTableColumn>
+                        <reportColumn>Animal_Action__c.Previous_Action_Detail__c</reportColumn>
+                        <showSubTotal>false</showSubTotal>
+                        <showTotal>false</showTotal>
+                        <type>detail</type>
+                    </flexTableColumn>
+                    <flexTableColumn>
+                        <reportColumn>Animal_Action__c.Date_Time_of_Action__c</reportColumn>
+                        <showSubTotal>false</showSubTotal>
+                        <showTotal>false</showTotal>
+                        <type>detail</type>
+                    </flexTableColumn>
+                    <flexTableSortInfo>
+                        <sortColumn>FK_Animal__c.Animal_Name__c</sortColumn>
+                        <sortOrder>1</sortOrder>
+                    </flexTableSortInfo>
+                    <hideChatterPhotos>true</hideChatterPhotos>
+                </flexComponentProperties>
+                <groupingSortProperties/>
+                <header>Animals with Vaccinations Due</header>
+                <report>AnimalShelterReports/Animals_with_Vaccinations_Due_Zxc</report>
+            </dashboardComponent>
+            <rowIndex>8</rowIndex>
+            <rowSpan>5</rowSpan>
+        </dashboardGridComponents>
+        <numberOfColumns>12</numberOfColumns>
+        <rowHeight>36</rowHeight>
+    </dashboardGridLayout>
+    <dashboardType>SpecifiedUser</dashboardType>
+    <description>Default Dashboard for Animal Shelter Starter</description>
+    <isGridLayout>true</isGridLayout>
+    <owner>test-tpvqkbctykbo@example.com</owner>
+    <runningUser>test-tpvqkbctykbo@example.com</runningUser>
+    <textColor>#000000</textColor>
+    <title>Animal Shelter Dashboard</title>
+    <titleColor>#000000</titleColor>
+    <titleSize>12</titleSize>
+</Dashboard>
diff --git a/force-app/main/default/permissionsets/Animal_Shelter_Starter.permissionset-meta.xml b/force-app/main/default/permissionsets/Animal_Shelter_Starter.permissionset-meta.xml
index 1eca7a8a..ed20ebe4 100644
--- a/force-app/main/default/permissionsets/Animal_Shelter_Starter.permissionset-meta.xml
+++ b/force-app/main/default/permissionsets/Animal_Shelter_Starter.permissionset-meta.xml
@@ -1083,6 +1083,11 @@
         <field>Locations__c.Organisation__c</field>
         <readable>true</readable>
     </fieldPermissions>
+    <fieldPermissions>
+        <editable>false</editable>
+        <field>Locations__c.Parent_Block_Name__c</field>
+        <readable>true</readable>
+    </fieldPermissions>
     <fieldPermissions>
         <editable>true</editable>
         <field>Locations__c.Parent_Block__c</field>
diff --git a/force-app/main/default/reports/AnimalShelterReports/Active_Approved_Adopter_Profiles_GvH.report-meta.xml b/force-app/main/default/reports/AnimalShelterReports/Active_Approved_Adopter_Profiles_GvH.report-meta.xml
new file mode 100644
index 00000000..87afc918
--- /dev/null
+++ b/force-app/main/default/reports/AnimalShelterReports/Active_Approved_Adopter_Profiles_GvH.report-meta.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Report xmlns="http://soap.sforce.com/2006/04/metadata">
+    <chart>
+        <backgroundColor1>#FFFFFF</backgroundColor1>
+        <backgroundColor2>#FFFFFF</backgroundColor2>
+        <backgroundFadeDir>Diagonal</backgroundFadeDir>
+        <chartSummaries>
+            <aggregate>Sum</aggregate>
+            <axisBinding>y</axisBinding>
+            <column>Adopter_Profile__c.Active__c</column>
+        </chartSummaries>
+        <chartType>Donut</chartType>
+        <enableHoverLabels>false</enableHoverLabels>
+        <expandOthers>false</expandOthers>
+        <groupingColumn>Adopter_Profile__c.Profile_Approval_Status__c</groupingColumn>
+        <legendPosition>Right</legendPosition>
+        <location>CHART_BOTTOM</location>
+        <showAxisLabels>true</showAxisLabels>
+        <showPercentage>false</showPercentage>
+        <showTotal>true</showTotal>
+        <showValues>false</showValues>
+        <size>Medium</size>
+        <summaryAxisRange>Auto</summaryAxisRange>
+        <textColor>#000000</textColor>
+        <textSize>12</textSize>
+        <titleColor>#000000</titleColor>
+        <titleSize>18</titleSize>
+    </chart>
+    <columns>
+        <field>Adopter_Profile__c.Contact_Name__c</field>
+    </columns>
+    <columns>
+        <field>Adopter_Profile__c.Type_of_Animal__c</field>
+    </columns>
+    <columns>
+        <field>CUST_NAME</field>
+    </columns>
+    <columns>
+        <aggregateTypes>Sum</aggregateTypes>
+        <field>Adopter_Profile__c.Active__c</field>
+    </columns>
+    <filter>
+        <criteriaItems>
+            <column>Adopter_Profile__c.Active__c</column>
+            <columnToColumn>false</columnToColumn>
+            <isUnlocked>true</isUnlocked>
+            <operator>equals</operator>
+            <value>1</value>
+        </criteriaItems>
+        <criteriaItems>
+            <column>Adopter_Profile__c.Profile_Approval_Status__c</column>
+            <columnToColumn>false</columnToColumn>
+            <isUnlocked>true</isUnlocked>
+            <operator>equals</operator>
+            <value>Approved</value>
+        </criteriaItems>
+        <language>en_US</language>
+    </filter>
+    <format>Summary</format>
+    <groupingsDown>
+        <dateGranularity>Day</dateGranularity>
+        <field>Adopter_Profile__c.Profile_Approval_Status__c</field>
+        <sortOrder>Asc</sortOrder>
+    </groupingsDown>
+    <name>Active &amp; Approved Adopter Profiles</name>
+    <params>
+        <name>co</name>
+        <value>0</value>
+    </params>
+    <reportType>CustomEntity$Adopter_Profile__c@Adopter_Profile__c.Contact__c</reportType>
+    <scope>organization</scope>
+    <showDetails>true</showDetails>
+    <showGrandTotal>true</showGrandTotal>
+    <showSubTotals>false</showSubTotals>
+    <timeFrameFilter>
+        <dateColumn>Adopter_Profile__c.Profile_End_Date__c</dateColumn>
+        <interval>INTERVAL_CUSTOM</interval>
+    </timeFrameFilter>
+</Report>
diff --git a/force-app/main/default/reports/AnimalShelterReports/Animals_with_Vaccinations_Due_Zxc.report-meta.xml b/force-app/main/default/reports/AnimalShelterReports/Animals_with_Vaccinations_Due_Zxc.report-meta.xml
index 0da97d20..52faaed4 100644
--- a/force-app/main/default/reports/AnimalShelterReports/Animals_with_Vaccinations_Due_Zxc.report-meta.xml
+++ b/force-app/main/default/reports/AnimalShelterReports/Animals_with_Vaccinations_Due_Zxc.report-meta.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Report xmlns="http://soap.sforce.com/2006/04/metadata">
-    <columns>
-        <field>FK_NAME</field>
-    </columns>
-    <columns>
-        <field>CUST_NAME</field>
-    </columns>
     <columns>
         <field>FK_$Animal__c.Animal_Name__c</field>
     </columns>
diff --git a/force-app/main/default/reports/AnimalShelterReports/Locations_All_Available_Locations_qYH.report-meta.xml b/force-app/main/default/reports/AnimalShelterReports/Locations_All_Available_Locations_qYH.report-meta.xml
index 9945e088..56add3a3 100644
--- a/force-app/main/default/reports/AnimalShelterReports/Locations_All_Available_Locations_qYH.report-meta.xml
+++ b/force-app/main/default/reports/AnimalShelterReports/Locations_All_Available_Locations_qYH.report-meta.xml
@@ -1,40 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Report xmlns="http://soap.sforce.com/2006/04/metadata">
-    <columns>
-        <field>CUST_NAME</field>
-    </columns>
+    <chart>
+        <backgroundColor1>#FFFFFF</backgroundColor1>
+        <backgroundColor2>#FFFFFF</backgroundColor2>
+        <backgroundFadeDir>Diagonal</backgroundFadeDir>
+        <chartSummaries>
+            <aggregate>Sum</aggregate>
+            <axisBinding>y</axisBinding>
+            <column>Locations__c.Capacity__c</column>
+        </chartSummaries>
+        <chartType>Donut</chartType>
+        <enableHoverLabels>false</enableHoverLabels>
+        <expandOthers>false</expandOthers>
+        <groupingColumn>Locations__c.Parent_Block_Name__c</groupingColumn>
+        <legendPosition>Right</legendPosition>
+        <location>CHART_BOTTOM</location>
+        <showAxisLabels>true</showAxisLabels>
+        <showPercentage>false</showPercentage>
+        <showTotal>false</showTotal>
+        <showValues>true</showValues>
+        <size>Medium</size>
+        <summaryAxisRange>Auto</summaryAxisRange>
+        <textColor>#000000</textColor>
+        <textSize>12</textSize>
+        <title>Available Capacity</title>
+        <titleColor>#000000</titleColor>
+        <titleSize>18</titleSize>
+    </chart>
     <columns>
         <field>Locations__c.Block_Unit__c</field>
     </columns>
     <columns>
-        <field>Locations__c.Last_Assessment_Date__c</field>
-    </columns>
-    <columns>
-        <field>Locations__c.Assessment_Due__c</field>
+        <aggregateTypes>Sum</aggregateTypes>
+        <field>Locations__c.Capacity__c</field>
     </columns>
     <columns>
         <aggregateTypes>Sum</aggregateTypes>
-        <field>Locations__c.Available_for_Boarding__c</field>
+        <field>Locations__c.Availability__c</field>
     </columns>
     <description>Shows all locations which are currently available for animals.</description>
     <filter>
-        <criteriaItems>
-            <column>Locations__c.Unit_Status__c</column>
-            <columnToColumn>false</columnToColumn>
-            <isUnlocked>true</isUnlocked>
-            <operator>equals</operator>
-            <value>Available</value>
-        </criteriaItems>
         <criteriaItems>
             <column>CUST_RECORDTYPE</column>
             <columnToColumn>false</columnToColumn>
             <isUnlocked>true</isUnlocked>
             <operator>equals</operator>
-            <value>Locations__c.Block,Locations__c.Unit</value>
+            <value>Locations__c.Unit</value>
         </criteriaItems>
         <language>en_US</language>
     </filter>
-    <format>Tabular</format>
+    <format>Summary</format>
+    <groupingsDown>
+        <dateGranularity>Day</dateGranularity>
+        <field>Locations__c.Parent_Block_Name__c</field>
+        <sortOrder>Asc</sortOrder>
+    </groupingsDown>
     <name>Locations - All Available Locations</name>
     <params>
         <name>co</name>
diff --git a/force-app/main/default/reports/AnimalShelterReports/Successful_Adoptions_by_Match_Type_S85.report-meta.xml b/force-app/main/default/reports/AnimalShelterReports/Successful_Adoptions_by_Match_Type_S85.report-meta.xml
new file mode 100644
index 00000000..961e96ae
--- /dev/null
+++ b/force-app/main/default/reports/AnimalShelterReports/Successful_Adoptions_by_Match_Type_S85.report-meta.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Report xmlns="http://soap.sforce.com/2006/04/metadata">
+    <chart>
+        <backgroundColor1>#FFFFFF</backgroundColor1>
+        <backgroundColor2>#FFFFFF</backgroundColor2>
+        <backgroundFadeDir>Diagonal</backgroundFadeDir>
+        <chartSummaries>
+            <aggregate>Sum</aggregate>
+            <axisBinding>y</axisBinding>
+            <column>Adoption_Match__c.Successful_Adoption__c</column>
+        </chartSummaries>
+        <chartType>Donut</chartType>
+        <enableHoverLabels>false</enableHoverLabels>
+        <expandOthers>false</expandOthers>
+        <groupingColumn>Adoption_Match__c.Status__c</groupingColumn>
+        <legendPosition>Right</legendPosition>
+        <location>CHART_BOTTOM</location>
+        <showAxisLabels>false</showAxisLabels>
+        <showPercentage>false</showPercentage>
+        <showTotal>true</showTotal>
+        <showValues>false</showValues>
+        <size>Medium</size>
+        <summaryAxisRange>Auto</summaryAxisRange>
+        <textColor>#000000</textColor>
+        <textSize>12</textSize>
+        <titleColor>#000000</titleColor>
+        <titleSize>18</titleSize>
+    </chart>
+    <columns>
+        <field>CUST_NAME</field>
+    </columns>
+    <columns>
+        <field>FK_NAME</field>
+    </columns>
+    <columns>
+        <field>Adoption_Match__c.Animal_Name__c</field>
+    </columns>
+    <columns>
+        <field>Adoption_Match__c.Related_Animal_Status__c</field>
+    </columns>
+    <columns>
+        <aggregateTypes>Sum</aggregateTypes>
+        <field>Adoption_Match__c.Successful_Adoption__c</field>
+    </columns>
+    <filter>
+        <criteriaItems>
+            <column>Adoption_Match__c.Successful_Adoption__c</column>
+            <columnToColumn>false</columnToColumn>
+            <isUnlocked>true</isUnlocked>
+            <operator>equals</operator>
+            <value>1</value>
+        </criteriaItems>
+        <language>en_US</language>
+    </filter>
+    <format>Summary</format>
+    <groupingsDown>
+        <dateGranularity>Day</dateGranularity>
+        <field>Adoption_Match__c.Status__c</field>
+        <sortOrder>Asc</sortOrder>
+    </groupingsDown>
+    <name>Successful Adoptions by Match Type</name>
+    <params>
+        <name>co</name>
+        <value>0</value>
+    </params>
+    <reportType>CustomEntity$Adoption_Match__c@Adoption_Match__c.Animal__c</reportType>
+    <scope>organization</scope>
+    <showDetails>false</showDetails>
+    <showGrandTotal>true</showGrandTotal>
+    <showSubTotals>true</showSubTotals>
+    <timeFrameFilter>
+        <dateColumn>CUST_CREATED_DATE</dateColumn>
+        <interval>INTERVAL_CUSTOM</interval>
+    </timeFrameFilter>
+</Report>